From 38b2a2c50286374501fa583c3e2e1f1edf793a01 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 3 Jun 2022 16:11:50 -0700 Subject: [PATCH] tracing: update mysten-infra pointer and enable control of tracing via env vars --- Cargo.lock | 178 ++++++++++++++++++++++------ crates/sui-cluster-test/Cargo.toml | 2 +- crates/sui-cluster-test/src/main.rs | 10 +- crates/sui-core/Cargo.toml | 6 +- crates/sui-gateway/Cargo.toml | 2 +- crates/sui-network/Cargo.toml | 2 +- crates/sui-node/Cargo.toml | 4 +- crates/sui-node/src/main.rs | 11 +- crates/sui-storage/Cargo.toml | 4 +- crates/sui-swarm/Cargo.toml | 4 +- crates/sui-types/Cargo.toml | 4 +- crates/sui/Cargo.toml | 4 +- crates/sui/src/bin/rpc-server.rs | 12 +- crates/sui/src/bin/sui.rs | 11 +- crates/sui/src/bin/wallet.rs | 14 +-- crates/test-utils/Cargo.toml | 2 +- crates/workspace-hack/Cargo.toml | 35 ++++-- 17 files changed, 199 insertions(+), 106 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a8d05ec39a28..ea24224576962 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1000,6 +1000,42 @@ dependencies = [ "types", ] +[[package]] +name = "console-api" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c5fd425783d81668ed68ec98408a80498fb4ae2fd607797539e1a9dfa3618f" +dependencies = [ + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31432bc31ff8883bf6a693a79371862f73087822470c82d6a1ec778781ee3978" +dependencies = [ + "console-api", + "crossbeam-channel 0.5.4", + "crossbeam-utils 0.8.8", + "futures", + "hdrhistogram", + "humantime", + "prost-types", + "serde 1.0.137", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber 0.3.11", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1049,6 +1085,20 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel 0.5.4", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils 0.8.8", +] + [[package]] name = "crossbeam-channel" version = "0.4.4" @@ -1094,6 +1144,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.8", +] + [[package]] name = "crossbeam-utils" version = "0.7.2" @@ -2003,6 +2063,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -2577,6 +2647,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + [[package]] name = "jsonrpsee" version = "0.13.1" @@ -3759,7 +3835,7 @@ dependencies = [ [[package]] name = "mysten-network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c#988cad6aaafac84d52a93227a16867bf27c1ea4c" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223#ff5c1d69057fe93be658377462ca2875a57a0223" dependencies = [ "anyhow", "bincode", @@ -3777,7 +3853,7 @@ dependencies = [ [[package]] name = "name-variant" version = "1.0.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c#988cad6aaafac84d52a93227a16867bf27c1ea4c" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223#ff5c1d69057fe93be658377462ca2875a57a0223" dependencies = [ "proc-macro2", "quote", @@ -5735,7 +5811,7 @@ dependencies = [ "move-package", "move-unit-test", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "node", "num_cpus", "once_cell", @@ -5770,7 +5846,7 @@ dependencies = [ "sui-swarm", "sui-types", "sui-verifier", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "telemetry-subscribers", "tempfile", "test-utils", "tokio", @@ -5827,7 +5903,7 @@ dependencies = [ "sui-faucet", "sui-json", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -5887,7 +5963,7 @@ dependencies = [ "move-vm-runtime", "move-vm-types", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "node", "once_cell", "parking_lot 0.12.1", @@ -5910,7 +5986,7 @@ dependencies = [ "sui-network", "sui-storage", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=2de1a391654a7ee09d867de2f16627b915ad21f0)", + "telemetry-subscribers", "temp_testdir", "tempfile", "test-fuzz", @@ -5920,7 +5996,7 @@ dependencies = [ "tokio-stream", "tokio-util 0.7.2", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "types", "workspace-hack", ] @@ -6000,7 +6076,7 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-proc-macros", "move-core-types", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "once_cell", "prometheus_exporter", "schemars", @@ -6045,7 +6121,7 @@ dependencies = [ "async-trait", "bincode", "bytes", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "prost", "serde 1.0.137", "sui-types", @@ -6065,7 +6141,7 @@ dependencies = [ "futures", "jsonrpsee", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "parking_lot 0.12.1", "prometheus_exporter", "sui-config", @@ -6073,7 +6149,7 @@ dependencies = [ "sui-gateway", "sui-network", "sui-storage", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "telemetry-subscribers", "tokio", "tracing", "workspace-hack", @@ -6116,11 +6192,11 @@ dependencies = [ "rocksdb", "serde 1.0.137", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=2de1a391654a7ee09d867de2f16627b915ad21f0)", + "telemetry-subscribers", "tempfile", "tokio", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "workspace-hack", ] @@ -6130,7 +6206,7 @@ version = "0.0.0" dependencies = [ "anyhow", "futures", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "rand 0.7.3", "serde 1.0.137", "sui-config", @@ -6138,7 +6214,7 @@ dependencies = [ "sui-node", "sui-types", "tap", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "telemetry-subscribers", "tempfile", "tokio", "tonic-health", @@ -6221,7 +6297,7 @@ dependencies = [ "strum_macros", "thiserror", "tonic", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "workspace-hack", "zeroize", ] @@ -6314,29 +6390,17 @@ dependencies = [ [[package]] name = "telemetry-subscribers" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=2de1a391654a7ee09d867de2f16627b915ad21f0#2de1a391654a7ee09d867de2f16627b915ad21f0" -dependencies = [ - "once_cell", - "opentelemetry", - "opentelemetry-jaeger", - "tokio", - "tracing", - "tracing-appender", - "tracing-opentelemetry", - "tracing-subscriber 0.3.11", -] - -[[package]] -name = "telemetry-subscribers" -version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c#988cad6aaafac84d52a93227a16867bf27c1ea4c" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223#ff5c1d69057fe93be658377462ca2875a57a0223" dependencies = [ + "console-subscriber", "once_cell", "opentelemetry", "opentelemetry-jaeger", "tokio", "tracing", "tracing-appender", + "tracing-bunyan-formatter", + "tracing-chrome", "tracing-opentelemetry", "tracing-subscriber 0.3.11", ] @@ -6476,7 +6540,7 @@ dependencies = [ "tokio", "tokio-util 0.7.2", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "workspace-hack", ] @@ -6910,6 +6974,35 @@ dependencies = [ "syn", ] +[[package]] +name = "tracing-bunyan-formatter" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99ff040622c69c0fc4bd3ea5fe16630ce46400a79bd41339391b2d416ea24c" +dependencies = [ + "gethostname", + "log", + "serde 1.0.137", + "serde_json", + "time 0.3.9", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber 0.3.11", +] + +[[package]] +name = "tracing-chrome" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1ac1f6a3a47e9c755e65ef974653c978da2246487a16044a8ee1d9a0a67257c" +dependencies = [ + "crossbeam", + "json", + "tracing", + "tracing-subscriber 0.3.11", +] + [[package]] name = "tracing-core" version = "0.1.26" @@ -7035,7 +7128,7 @@ dependencies = [ [[package]] name = "typed-store" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c#988cad6aaafac84d52a93227a16867bf27c1ea4c" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223#ff5c1d69057fe93be658377462ca2875a57a0223" dependencies = [ "bincode", "collectable", @@ -7694,13 +7787,17 @@ dependencies = [ "config 0.1.0", "config 0.11.0", "consensus", + "console-api", + "console-subscriber", "constant_time_eq", "core2", "crc32fast", + "crossbeam", "crossbeam-channel 0.4.4", "crossbeam-channel 0.5.4", "crossbeam-deque", "crossbeam-epoch", + "crossbeam-queue", "crossbeam-utils 0.7.2", "crossbeam-utils 0.8.8", "crossterm 0.21.0", @@ -7775,6 +7872,7 @@ dependencies = [ "futures-timer", "futures-util", "generic-array 0.14.5", + "gethostname", "getrandom 0.1.16", "getrandom 0.2.6", "gimli", @@ -7825,6 +7923,7 @@ dependencies = [ "itoa 1.0.2", "jobserver", "js-sys", + "json", "jsonrpsee", "jsonrpsee-client-transport", "jsonrpsee-core", @@ -7904,7 +8003,7 @@ dependencies = [ "multihash-derive", "multimap", "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "name-variant", "named-lock", "nested", @@ -8071,8 +8170,7 @@ dependencies = [ "tap", "target-lexicon", "target-spec", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=2de1a391654a7ee09d867de2f16627b915ad21f0)", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "telemetry-subscribers", "temp_testdir", "tempfile", "tera", @@ -8116,6 +8214,8 @@ dependencies = [ "tracing", "tracing-appender", "tracing-attributes", + "tracing-bunyan-formatter", + "tracing-chrome", "tracing-core", "tracing-futures", "tracing-log", @@ -8127,7 +8227,7 @@ dependencies = [ "twox-hash", "typed-arena", "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=ff5c1d69057fe93be658377462ca2875a57a0223)", "typenum", "types", "ucd-trie", diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml index 2fd4eee9bc60c..8d424cd68ef13 100644 --- a/crates/sui-cluster-test/Cargo.toml +++ b/crates/sui-cluster-test/Cargo.toml @@ -16,7 +16,7 @@ serde_with = { version = "1.13.0", features = ["hex"] } tracing = { version = "0.1.34", features = ["log"] } clap = { version = "3.1.14", features = ["derive"] } reqwest = { version = "0.11.10", features = ["blocking", "json"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } sui-faucet = { path = "../sui-faucet" } sui = { path = "../sui" } diff --git a/crates/sui-cluster-test/src/main.rs b/crates/sui-cluster-test/src/main.rs index 2fd6a6bf0a80c..e31272aa273c2 100644 --- a/crates/sui-cluster-test/src/main.rs +++ b/crates/sui-cluster-test/src/main.rs @@ -405,13 +405,9 @@ impl ClusterTest { #[tokio::main] async fn main() { - let config = telemetry_subscribers::TelemetryConfig { - service_name: "cluster-test".into(), - enable_tracing: std::env::var("SUI_TRACING_ENABLE").is_ok(), - json_log_output: std::env::var("SUI_JSON_SPAN_LOGS").is_ok(), - ..Default::default() - }; - let _guard = telemetry_subscribers::init(config); + let _guard = telemetry_subscribers::TelemetryConfig::new(env!("CARGO_BIN_NAME")) + .with_env() + .init(); let options = ClusterTestOpt::parse(); let mut test = ClusterTest::setup(options); diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index 8634122052101..2e5f46f208e1d 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -33,7 +33,7 @@ clap = { version = "3.1.17", features = ["derive"] } bincode = "1.3.3" schemars = "0.8.10" multiaddr = "0.14.0" -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } prometheus_exporter = "0.8.4" once_cell = "1.11.0" colored = "2.0.0" @@ -56,7 +56,7 @@ move-package = { git = "https://github.com/move-language/move", rev = "1b2d3b427 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } move-vm-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223"} narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", package = "executor" } narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", package = "types" } @@ -70,7 +70,7 @@ serde_yaml = "0.8.23" pretty_assertions = "1.2.1" temp_testdir = "0.2.3" hex = "0.4.3" -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "2de1a391654a7ee09d867de2f16627b915ad21f0" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } test-fuzz = "3.0.2" test-utils = { path = "../test-utils" } diff --git a/crates/sui-gateway/Cargo.toml b/crates/sui-gateway/Cargo.toml index 888128102cb62..fc9368dd31316 100644 --- a/crates/sui-gateway/Cargo.toml +++ b/crates/sui-gateway/Cargo.toml @@ -31,5 +31,5 @@ sui-open-rpc = { path = "../sui-open-rpc" } sui-open-rpc-macros = { path = "../sui-open-rpc-macros" } move-core-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b", features = ["address20"] } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui-network/Cargo.toml b/crates/sui-network/Cargo.toml index 8cdcd4aab636b..8dafaf8961c04 100644 --- a/crates/sui-network/Cargo.toml +++ b/crates/sui-network/Cargo.toml @@ -17,7 +17,7 @@ bincode = "1.3.3" serde = "1.0.136" sui-types = { path = "../sui-types" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } workspace-hack = { path = "../workspace-hack"} [build-dependencies] diff --git a/crates/sui-node/Cargo.toml b/crates/sui-node/Cargo.toml index 4f80d4ad23891..36d1f29e56f7e 100644 --- a/crates/sui-node/Cargo.toml +++ b/crates/sui-node/Cargo.toml @@ -23,6 +23,6 @@ sui-storage = { path = "../sui-storage" } sui-gateway = { path = "../sui-gateway" } sui-network = { path = "../sui-network" } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui-node/src/main.rs b/crates/sui-node/src/main.rs index 5529a5c6f535a..41594bccdc563 100644 --- a/crates/sui-node/src/main.rs +++ b/crates/sui-node/src/main.rs @@ -21,14 +21,9 @@ struct Args { #[tokio::main] async fn main() -> Result<()> { // Initialize logging - let config = telemetry_subscribers::TelemetryConfig { - service_name: "sui-node".into(), - enable_tracing: std::env::var("SUI_TRACING_ENABLE").is_ok(), - json_log_output: std::env::var("SUI_JSON_SPAN_LOGS").is_ok(), - ..Default::default() - }; - - let _guard = telemetry_subscribers::init(config); + let _guard = telemetry_subscribers::TelemetryConfig::new(env!("CARGO_BIN_NAME")) + .with_env() + .init(); let args = Args::parse(); diff --git a/crates/sui-storage/Cargo.toml b/crates/sui-storage/Cargo.toml index 88a5804e1c0f9..54adc22368a6d 100644 --- a/crates/sui-storage/Cargo.toml +++ b/crates/sui-storage/Cargo.toml @@ -20,7 +20,7 @@ tracing = "0.1.34" sui-types = { path = "../sui-types" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223"} workspace-hack = { path = "../workspace-hack"} move-core-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b", features = ["address20"] } @@ -29,7 +29,7 @@ move-core-types = { git = "https://github.com/move-language/move", rev = "1b2d3b tempfile = "3.3.0" num_cpus = "1.13.1" pretty_assertions = "1.2.0" -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "2de1a391654a7ee09d867de2f16627b915ad21f0" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } [[bench]] name = "write_ahead_log" diff --git a/crates/sui-swarm/Cargo.toml b/crates/sui-swarm/Cargo.toml index 9ac5e7ec03278..e727fe4557e90 100644 --- a/crates/sui-swarm/Cargo.toml +++ b/crates/sui-swarm/Cargo.toml @@ -22,8 +22,8 @@ sui-core = { path = "../sui-core" } sui-node = { path = "../sui-node" } sui-types = { path = "../sui-types" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } workspace-hack = { path = "../workspace-hack"} [dev-dependencies] -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml index fbccd6811b61b..d7ce5ed25fb05 100644 --- a/crates/sui-types/Cargo.toml +++ b/crates/sui-types/Cargo.toml @@ -36,8 +36,8 @@ schemars ="0.8.10" tonic = "0.7" strum_macros = "^0.24" -name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } move-binary-format = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml index 6592e347d4d20..9367548bd2e8f 100644 --- a/crates/sui/Cargo.toml +++ b/crates/sui/Cargo.toml @@ -33,10 +33,10 @@ serde-value = "0.7.0" serde-name = "0.2.1" dirs = "4.0.0" clap = { version = "3.1.17", features = ["derive"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } prometheus_exporter = "0.8.4" multiaddr = "0.14.0" -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223" } bcs = "0.1.3" sui-core = { path = "../sui-core" } diff --git a/crates/sui/src/bin/rpc-server.rs b/crates/sui/src/bin/rpc-server.rs index a8293b34b121d..60773d1894736 100644 --- a/crates/sui/src/bin/rpc-server.rs +++ b/crates/sui/src/bin/rpc-server.rs @@ -38,14 +38,10 @@ struct RpcGatewayOpt { #[tokio::main] async fn main() -> anyhow::Result<()> { - let config = telemetry_subscribers::TelemetryConfig { - service_name: "rpc_gateway".into(), - enable_tracing: std::env::var("SUI_TRACING_ENABLE").is_ok(), - json_log_output: std::env::var("SUI_JSON_SPAN_LOGS").is_ok(), - ..Default::default() - }; - #[allow(unused)] - let guard = telemetry_subscribers::init(config); + let _guard = telemetry_subscribers::TelemetryConfig::new(env!("CARGO_BIN_NAME")) + .with_env() + .init(); + let options: RpcGatewayOpt = RpcGatewayOpt::parse(); let config_path = options .config diff --git a/crates/sui/src/bin/sui.rs b/crates/sui/src/bin/sui.rs index 00e205d32cd43..964eadb28e03f 100644 --- a/crates/sui/src/bin/sui.rs +++ b/crates/sui/src/bin/sui.rs @@ -22,14 +22,9 @@ struct SuiOpt { #[tokio::main] async fn main() -> Result<(), anyhow::Error> { - let config = telemetry_subscribers::TelemetryConfig { - service_name: "sui".into(), - enable_tracing: std::env::var("SUI_TRACING_ENABLE").is_ok(), - json_log_output: std::env::var("SUI_JSON_SPAN_LOGS").is_ok(), - ..Default::default() - }; - #[allow(unused)] - let guard = telemetry_subscribers::init(config); + let _guard = telemetry_subscribers::TelemetryConfig::new(env!("CARGO_BIN_NAME")) + .with_env() + .init(); let options: SuiOpt = SuiOpt::parse(); options.command.execute().await diff --git a/crates/sui/src/bin/wallet.rs b/crates/sui/src/bin/wallet.rs index 9bd579055ebc5..45412f7dd9542 100644 --- a/crates/sui/src/bin/wallet.rs +++ b/crates/sui/src/bin/wallet.rs @@ -53,15 +53,11 @@ struct ClientOpt { } async fn try_main() -> Result<(), anyhow::Error> { - let config = telemetry_subscribers::TelemetryConfig { - service_name: "wallet".into(), - enable_tracing: std::env::var("SUI_TRACING_ENABLE").is_ok(), - json_log_output: std::env::var("SUI_JSON_SPAN_LOGS").is_ok(), - log_file: Some("wallet.log".into()), - ..Default::default() - }; - #[allow(unused)] - let guard = telemetry_subscribers::init(config); + let _guard = telemetry_subscribers::TelemetryConfig::new(env!("CARGO_BIN_NAME")) + .with_log_file("wallet.log") + .with_env() + .init(); + if let Some(git_rev) = std::option_env!("GIT_REV") { debug!("Wallet built at git revision {git_rev}"); } diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 54e93ae2c2ab3..92e095ea8b8c0 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -23,7 +23,7 @@ sui-adapter = { path = "../sui-adapter" } sui-framework = { path = "../sui-framework" } move-package = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } move-core-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b", features = ["address20"] } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev ="988cad6aaafac84d52a93227a16867bf27c1ea4c"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev ="ff5c1d69057fe93be658377462ca2875a57a0223"} narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", package = "config" } sui-config = { path = "../sui-config" } diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index 208f990400410..0fdddb6c4910e 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -88,13 +88,17 @@ combine = { version = "4", features = ["alloc", "bytes", "std"] } config-a25acd0b92ef6c21 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", default-features = false } config-a6292c17cd707f01 = { package = "config", version = "0.11", features = ["hjson", "ini", "json", "rust-ini", "serde-hjson", "serde_json", "toml", "yaml", "yaml-rust"] } consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", features = ["benchmark", "rand"] } +console-api = { version = "0.3", default-features = false, features = ["transport"] } +console-subscriber = { version = "0.1", features = ["env-filter"] } constant_time_eq = { version = "0.1", default-features = false } core2 = { version = "0.4", default-features = false, features = ["alloc"] } crc32fast = { version = "1", features = ["std"] } +crossbeam = { version = "0.8", features = ["alloc", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", "std"] } crossbeam-channel-9fbad63c4bcf4a8f = { package = "crossbeam-channel", version = "0.4", default-features = false } crossbeam-channel-d8f496e17d97b5cb = { package = "crossbeam-channel", version = "0.5", features = ["crossbeam-utils", "std"] } crossbeam-deque = { version = "0.8", features = ["crossbeam-epoch", "crossbeam-utils", "std"] } crossbeam-epoch = { version = "0.9", default-features = false, features = ["alloc", "lazy_static", "std"] } +crossbeam-queue = { version = "0.3", default-features = false, features = ["alloc", "std"] } crossbeam-utils-ca01ad9e24f5d932 = { package = "crossbeam-utils", version = "0.7", features = ["lazy_static", "std"] } crossbeam-utils-c38e5c1d305a1b54 = { package = "crossbeam-utils", version = "0.8", features = ["lazy_static", "std"] } crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } @@ -158,6 +162,7 @@ futures-task = { version = "0.3", default-features = false, features = ["alloc", futures-timer = { version = "3", default-features = false, features = ["gloo-timers", "send_wrapper", "wasm-bindgen"] } futures-util = { version = "0.3", default-features = false, features = ["alloc", "async-await", "async-await-macro", "bilock", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std", "unstable"] } generic-array = { version = "0.14", default-features = false, features = ["more_lengths"] } +gethostname = { version = "0.2", default-features = false } getrandom-c65f7effa3be6d31 = { package = "getrandom", version = "0.1", default-features = false, features = ["std"] } getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } gimli = { version = "0.26", default-features = false, features = ["read", "read-core"] } @@ -202,6 +207,7 @@ itertools = { version = "0.10", features = ["use_alloc", "use_std"] } itoa-9fbad63c4bcf4a8f = { package = "itoa", version = "0.4", features = ["std"] } itoa-dff4ba8e3ae991db = { package = "itoa", version = "1", default-features = false } js-sys = { version = "0.3", default-features = false } +json = { version = "0.12", default-features = false } jsonrpsee = { version = "0.13", default-features = false, features = ["async-client", "client", "client-ws-transport", "full", "http-client", "http-server", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-http-server", "jsonrpsee-proc-macros", "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "jsonrpsee-ws-server", "macros", "server", "tracing", "wasm-client", "ws-client", "ws-server"] } jsonrpsee-client-transport = { version = "0.13", default-features = false, features = ["anyhow", "futures-channel", "futures-timer", "futures-util", "gloo-net", "http", "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tls", "tokio", "tokio-rustls", "tokio-util", "web", "webpki-roots", "ws"] } jsonrpsee-core = { version = "0.13", features = ["arrayvec", "async-client", "async-lock", "async-wasm-client", "client", "futures-timer", "futures-util", "http-helpers", "hyper", "parking_lot", "rand", "rustc-hash", "server", "soketto", "tokio", "tracing", "wasm-bindgen-futures"] } @@ -275,7 +281,7 @@ move-vm-types = { git = "https://github.com/move-language/move", rev = "1b2d3b42 multiaddr = { version = "0.14", features = ["url"] } multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] } mysten-network-9da6af2c8f03eecf = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe", default-features = false } -mysten-network-6e4060f3e383a374 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c", default-features = false } +mysten-network-3a0625ec1f927a79 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223", default-features = false } named-lock = { version = "0.1", default-features = false } nested = { version = "0.1", default-features = false } network = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", default-features = false } @@ -330,6 +336,7 @@ proc-macro2 = { version = "1", features = ["proc-macro", "span-locations"] } prometheus = { version = "0.13", default-features = false } prometheus_exporter = { version = "0.8", features = ["internal_metrics", "lazy_static", "log", "logging"] } prost = { version = "0.10", features = ["prost-derive", "std"] } +prost-types = { version = "0.10", features = ["std"] } ptree = { version = "0.4", features = ["ansi", "ansi_term", "atty", "conf", "config", "directories", "petgraph", "serde-value", "tint", "value"] } quote = { version = "1", features = ["proc-macro"] } radix_trie = { version = "0.2", default-features = false } @@ -406,8 +413,7 @@ tabular = { version = "0.2", features = ["ansi-cell", "strip-ansi-escapes", "uni tap = { version = "1", default-features = false } target-lexicon = { version = "0.12", features = ["std"] } target-spec = { version = "1", default-features = false, features = ["serde", "summaries"] } -telemetry-subscribers-2c266570e79e716a = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "2de1a391654a7ee09d867de2f16627b915ad21f0", features = ["jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-opentelemetry"] } -telemetry-subscribers-6e4060f3e383a374 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c", features = ["jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-opentelemetry"] } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223", features = ["chrome", "console-subscriber", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tokio-console", "tracing-chrome", "tracing-opentelemetry"] } temp_testdir = { version = "0.2", default-features = false } tempfile = { version = "3", default-features = false } tera = { version = "1", features = ["builtins", "chrono", "chrono-tz", "humansize", "percent-encoding", "rand", "slug"] } @@ -443,6 +449,8 @@ tower-layer = { version = "0.3", default-features = false } tower-service = { version = "0.3", default-features = false } tracing = { version = "0.1", features = ["attributes", "log", "std", "tracing-attributes"] } tracing-appender = { version = "0.2", default-features = false } +tracing-bunyan-formatter = { version = "0.3" } +tracing-chrome = { version = "0.6", default-features = false } tracing-core = { version = "0.1", features = ["lazy_static", "std"] } tracing-futures = { version = "0.2", features = ["pin-project", "std", "std-future"] } tracing-log = { version = "0.1", features = ["log-tracer", "std", "trace-logger"] } @@ -454,7 +462,7 @@ tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } typed-store-9da6af2c8f03eecf = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe", default-features = false } -typed-store-6e4060f3e383a374 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c", default-features = false } +typed-store-3a0625ec1f927a79 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223", default-features = false } typenum = { version = "1", default-features = false } types = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9" } ucd-trie = { version = "0.1", features = ["std"] } @@ -581,13 +589,17 @@ combine = { version = "4", features = ["alloc", "bytes", "std"] } config-a25acd0b92ef6c21 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", default-features = false } config-a6292c17cd707f01 = { package = "config", version = "0.11", features = ["hjson", "ini", "json", "rust-ini", "serde-hjson", "serde_json", "toml", "yaml", "yaml-rust"] } consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", features = ["benchmark", "rand"] } +console-api = { version = "0.3", default-features = false, features = ["transport"] } +console-subscriber = { version = "0.1", features = ["env-filter"] } constant_time_eq = { version = "0.1", default-features = false } core2 = { version = "0.4", default-features = false, features = ["alloc"] } crc32fast = { version = "1", features = ["std"] } +crossbeam = { version = "0.8", features = ["alloc", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", "std"] } crossbeam-channel-9fbad63c4bcf4a8f = { package = "crossbeam-channel", version = "0.4", default-features = false } crossbeam-channel-d8f496e17d97b5cb = { package = "crossbeam-channel", version = "0.5", features = ["crossbeam-utils", "std"] } crossbeam-deque = { version = "0.8", features = ["crossbeam-epoch", "crossbeam-utils", "std"] } crossbeam-epoch = { version = "0.9", default-features = false, features = ["alloc", "lazy_static", "std"] } +crossbeam-queue = { version = "0.3", default-features = false, features = ["alloc", "std"] } crossbeam-utils-ca01ad9e24f5d932 = { package = "crossbeam-utils", version = "0.7", features = ["lazy_static", "std"] } crossbeam-utils-c38e5c1d305a1b54 = { package = "crossbeam-utils", version = "0.8", features = ["lazy_static", "std"] } crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } @@ -662,6 +674,7 @@ futures-task = { version = "0.3", default-features = false, features = ["alloc", futures-timer = { version = "3", default-features = false, features = ["gloo-timers", "send_wrapper", "wasm-bindgen"] } futures-util = { version = "0.3", default-features = false, features = ["alloc", "async-await", "async-await-macro", "bilock", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std", "unstable"] } generic-array = { version = "0.14", default-features = false, features = ["more_lengths"] } +gethostname = { version = "0.2", default-features = false } getrandom-c65f7effa3be6d31 = { package = "getrandom", version = "0.1", default-features = false, features = ["std"] } getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } gimli = { version = "0.26", default-features = false, features = ["read", "read-core"] } @@ -712,6 +725,7 @@ itoa-9fbad63c4bcf4a8f = { package = "itoa", version = "0.4", features = ["std"] itoa-dff4ba8e3ae991db = { package = "itoa", version = "1", default-features = false } jobserver = { version = "0.1", default-features = false } js-sys = { version = "0.3", default-features = false } +json = { version = "0.12", default-features = false } jsonrpsee = { version = "0.13", default-features = false, features = ["async-client", "client", "client-ws-transport", "full", "http-client", "http-server", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-http-server", "jsonrpsee-proc-macros", "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "jsonrpsee-ws-server", "macros", "server", "tracing", "wasm-client", "ws-client", "ws-server"] } jsonrpsee-client-transport = { version = "0.13", default-features = false, features = ["anyhow", "futures-channel", "futures-timer", "futures-util", "gloo-net", "http", "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tls", "tokio", "tokio-rustls", "tokio-util", "web", "webpki-roots", "ws"] } jsonrpsee-core = { version = "0.13", features = ["arrayvec", "async-client", "async-lock", "async-wasm-client", "client", "futures-timer", "futures-util", "http-helpers", "hyper", "parking_lot", "rand", "rustc-hash", "server", "soketto", "tokio", "tracing", "wasm-bindgen-futures"] } @@ -791,8 +805,8 @@ multihash = { version = "0.16", default-features = false, features = ["alloc", " multihash-derive = { version = "0.8", default-features = false, features = ["std"] } multimap = { version = "0.8", default-features = false } mysten-network-9da6af2c8f03eecf = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe", default-features = false } -mysten-network-6e4060f3e383a374 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c", default-features = false } -name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c", default-features = false } +mysten-network-3a0625ec1f927a79 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223", default-features = false } +name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223", default-features = false } named-lock = { version = "0.1", default-features = false } nested = { version = "0.1", default-features = false } network = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9", default-features = false } @@ -865,7 +879,7 @@ prometheus_exporter = { version = "0.8", features = ["internal_metrics", "lazy_s prost = { version = "0.10", features = ["prost-derive", "std"] } prost-build = { version = "0.10" } prost-derive = { version = "0.10", default-features = false } -prost-types = { version = "0.10", default-features = false } +prost-types = { version = "0.10", features = ["std"] } ptree = { version = "0.4", features = ["ansi", "ansi_term", "atty", "conf", "config", "directories", "petgraph", "serde-value", "tint", "value"] } quote = { version = "1", features = ["proc-macro"] } radix_trie = { version = "0.2", default-features = false } @@ -958,8 +972,7 @@ tabular = { version = "0.2", features = ["ansi-cell", "strip-ansi-escapes", "uni tap = { version = "1", default-features = false } target-lexicon = { version = "0.12", features = ["std"] } target-spec = { version = "1", default-features = false, features = ["serde", "summaries"] } -telemetry-subscribers-2c266570e79e716a = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "2de1a391654a7ee09d867de2f16627b915ad21f0", features = ["jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-opentelemetry"] } -telemetry-subscribers-6e4060f3e383a374 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c", features = ["jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-opentelemetry"] } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223", features = ["chrome", "console-subscriber", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tokio-console", "tracing-chrome", "tracing-opentelemetry"] } temp_testdir = { version = "0.2", default-features = false } tempfile = { version = "3", default-features = false } tera = { version = "1", features = ["builtins", "chrono", "chrono-tz", "humansize", "percent-encoding", "rand", "slug"] } @@ -1003,6 +1016,8 @@ tower-service = { version = "0.3", default-features = false } tracing = { version = "0.1", features = ["attributes", "log", "std", "tracing-attributes"] } tracing-appender = { version = "0.2", default-features = false } tracing-attributes = { version = "0.1", default-features = false } +tracing-bunyan-formatter = { version = "0.3" } +tracing-chrome = { version = "0.6", default-features = false } tracing-core = { version = "0.1", features = ["lazy_static", "std"] } tracing-futures = { version = "0.2", features = ["pin-project", "std", "std-future"] } tracing-log = { version = "0.1", features = ["log-tracer", "std", "trace-logger"] } @@ -1014,7 +1029,7 @@ tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } typed-store-9da6af2c8f03eecf = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe", default-features = false } -typed-store-6e4060f3e383a374 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "988cad6aaafac84d52a93227a16867bf27c1ea4c", default-features = false } +typed-store-3a0625ec1f927a79 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "ff5c1d69057fe93be658377462ca2875a57a0223", default-features = false } typenum = { version = "1", default-features = false } types = { git = "https://github.com/MystenLabs/narwhal", rev = "2c5e8236c0702a3ff47dd769c2bbc94b029bf4a9" } ucd-trie = { version = "0.1", features = ["std"] }