diff --git a/Cargo.lock b/Cargo.lock index a114f4a5ecfbe..8be5cf1d53eba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ dependencies = [ "clap", "mysten-network", "rand 0.8.5", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", ] @@ -2624,7 +2624,7 @@ dependencies = [ "fastcrypto", "futures", "mockall", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "parking_lot 0.12.1", "prometheus", @@ -2636,7 +2636,7 @@ dependencies = [ "shared-crypto", "sui-protocol-config", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "thiserror", "tokio", @@ -7423,27 +7423,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "prometheus", - "prometheus-closure-metric 0.1.0", - "scopeguard", - "tap", - "tokio", - "tracing", - "uuid 1.2.2", -] - -[[package]] -name = "mysten-metrics" -version = "0.7.0" -source = "git+https://github.com/mystenlabs/sui.git?branch=main#9b991637c51417e4b3c644d56ed674c4ae37972f" -dependencies = [ - "async-trait", - "axum", - "dashmap", - "futures", - "once_cell", - "parking_lot 0.12.1", - "prometheus", - "prometheus-closure-metric 0.1.0 (git+https://github.com/mystenlabs/sui.git?branch=main)", + "prometheus-closure-metric", "scopeguard", "tap", "tokio", @@ -7480,38 +7460,23 @@ version = "0.0.1" dependencies = [ "anyhow", "axum", - "mysten-metrics 0.7.0", + "mysten-metrics", "prometheus", "serde", "serde_json", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", "tower", "tracing", ] -[[package]] -name = "mysten-service" -version = "0.0.1" -source = "git+https://github.com/mystenlabs/sui.git?branch=main#9b991637c51417e4b3c644d56ed674c4ae37972f" -dependencies = [ - "anyhow", - "axum", - "mysten-metrics 0.7.0 (git+https://github.com/mystenlabs/sui.git?branch=main)", - "prometheus", - "serde", - "telemetry-subscribers 0.2.0 (git+https://github.com/mystenlabs/sui.git?branch=main)", - "tokio", - "tracing", -] - [[package]] name = "mysten-service-boilerplate" version = "0.0.1" dependencies = [ "anyhow", "axum", - "mysten-service 0.0.1 (git+https://github.com/mystenlabs/sui.git?branch=main)", + "mysten-service", "prometheus", "serde", "tokio", @@ -7613,7 +7578,7 @@ dependencies = [ "futures", "indexmap 2.1.0", "mockall", - "mysten-metrics 0.7.0", + "mysten-metrics", "narwhal-config", "narwhal-crypto", "narwhal-network", @@ -7625,7 +7590,7 @@ dependencies = [ "prometheus", "serde", "sui-protocol-config", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "thiserror", "tokio", @@ -7650,7 +7615,7 @@ dependencies = [ "dashmap", "futures", "mysten-common", - "mysten-metrics 0.7.0", + "mysten-metrics", "narwhal-crypto", "narwhal-test-utils", "narwhal-types", @@ -7678,7 +7643,7 @@ dependencies = [ "eyre", "fastcrypto", "futures", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "narwhal-config", "narwhal-crypto", @@ -7698,7 +7663,7 @@ dependencies = [ "sui-keys", "sui-protocol-config", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "thiserror", "tokio", "tokio-stream", @@ -7730,7 +7695,7 @@ dependencies = [ "itertools 0.10.5", "mockall", "mysten-common", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "narwhal-config", "narwhal-crypto", @@ -7750,7 +7715,7 @@ dependencies = [ "sui-macros", "sui-protocol-config", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "thiserror", "tokio", @@ -7791,7 +7756,7 @@ dependencies = [ "fdlimit", "indexmap 2.1.0", "itertools 0.10.5", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "narwhal-config", "narwhal-crypto", @@ -7806,7 +7771,7 @@ dependencies = [ "prometheus", "rand 0.8.5", "sui-protocol-config", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tonic 0.11.0", @@ -7832,7 +7797,7 @@ dependencies = [ "indexmap 2.1.0", "mockall", "mysten-common", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "mysten-util-mem", "narwhal-config", @@ -7876,7 +7841,7 @@ dependencies = [ "futures", "governor", "itertools 0.10.5", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "narwhal-config", "narwhal-crypto", @@ -7891,7 +7856,7 @@ dependencies = [ "reqwest", "sui-protocol-config", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "thiserror", "tokio", @@ -9385,16 +9350,6 @@ dependencies = [ "protobuf", ] -[[package]] -name = "prometheus-closure-metric" -version = "0.1.0" -source = "git+https://github.com/mystenlabs/sui.git?branch=main#9b991637c51417e4b3c644d56ed674c4ae37972f" -dependencies = [ - "anyhow", - "prometheus", - "protobuf", -] - [[package]] name = "prometheus-http-query" version = "0.6.6" @@ -11683,7 +11638,7 @@ dependencies = [ "sui-types", "tabled", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "thiserror", @@ -11831,7 +11786,7 @@ dependencies = [ "move-binary-format", "move-bytecode-utils", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "num_enum 0.6.1", "object_store 0.7.0", "parquet", @@ -11852,7 +11807,7 @@ dependencies = [ "sui-storage", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "thiserror", "tokio", @@ -11899,7 +11854,7 @@ dependencies = [ "sui-storage", "sui-swarm-config", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -11910,7 +11865,7 @@ name = "sui-authority-aggregation" version = "0.1.0" dependencies = [ "futures", - "mysten-metrics 0.7.0", + "mysten-metrics", "sui-types", "tokio", "tracing", @@ -11930,7 +11885,7 @@ dependencies = [ "crossterm", "eyre", "futures", - "mysten-metrics 0.7.0", + "mysten-metrics", "narwhal-config", "prettytable-rs", "prometheus-parse", @@ -11963,7 +11918,7 @@ dependencies = [ "indicatif", "itertools 0.10.5", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "narwhal-node", "prometheus", "rand 0.8.5", @@ -11989,7 +11944,7 @@ dependencies = [ "sui-test-transaction-builder", "sui-types", "sysinfo", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "test-cluster", "tokio", "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -12017,7 +11972,7 @@ dependencies = [ "hex-literal 0.3.4", "lru 0.10.0", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "num_enum 0.6.1", "once_cell", "prometheus", @@ -12035,7 +11990,7 @@ dependencies = [ "sui-test-transaction-builder", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "tokio", @@ -12076,7 +12031,7 @@ dependencies = [ "sui-swarm-config", "sui-test-transaction-builder", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "tokio", @@ -12089,7 +12044,7 @@ name = "sui-common" version = "0.1.0" dependencies = [ "futures", - "mysten-metrics 0.7.0", + "mysten-metrics", "sui-types", "tokio", "tracing", @@ -12162,7 +12117,7 @@ dependencies = [ "move-package", "move-symbol-pool", "mysten-common", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "narwhal-config", "narwhal-crypto", @@ -12210,7 +12165,7 @@ dependencies = [ "sui-transaction-checks", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "test-fuzz", @@ -12262,7 +12217,7 @@ dependencies = [ "byteorder", "bytes", "futures", - "mysten-metrics 0.7.0", + "mysten-metrics", "notify", "object_store 0.7.0", "prometheus", @@ -12274,7 +12229,7 @@ dependencies = [ "sui-data-ingestion-core", "sui-storage", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -12289,7 +12244,7 @@ dependencies = [ "async-trait", "backoff", "futures", - "mysten-metrics 0.7.0", + "mysten-metrics", "notify", "object_store 0.7.0", "prometheus", @@ -12299,7 +12254,7 @@ dependencies = [ "sui-storage", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -12326,7 +12281,7 @@ dependencies = [ "move-binary-format", "move-core-types", "move-package", - "mysten-metrics 0.7.0", + "mysten-metrics", "prometheus", "rand 0.8.5", "serde", @@ -12352,7 +12307,7 @@ dependencies = [ "sui-test-transaction-builder", "sui-tool", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "tokio", @@ -12424,7 +12379,7 @@ dependencies = [ "eyre", "futures", "http", - "mysten-metrics 0.7.0", + "mysten-metrics", "parking_lot 0.12.1", "prometheus", "rocksdb", @@ -12438,7 +12393,7 @@ dependencies = [ "sui-sdk", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "thiserror", @@ -12576,7 +12531,7 @@ dependencies = [ "move-core-types", "move-disassembler", "move-ir-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "once_cell", "prometheus", @@ -12605,7 +12560,7 @@ dependencies = [ "sui-test-transaction-builder", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "test-cluster", "thiserror", "tokio", @@ -12660,7 +12615,7 @@ dependencies = [ "move-binary-format", "move-bytecode-utils", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "ntest", "prometheus", "rayon", @@ -12684,7 +12639,7 @@ dependencies = [ "sui-transaction-builder", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "test-cluster", "thiserror", "tokio", @@ -12734,7 +12689,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "move-package", - "mysten-metrics 0.7.0", + "mysten-metrics", "once_cell", "prometheus", "serde", @@ -12752,7 +12707,7 @@ dependencies = [ "sui-transaction-builder", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "thiserror", "tokio", "tower", @@ -12768,7 +12723,7 @@ dependencies = [ "anyhow", "fastcrypto", "jsonrpsee", - "mysten-metrics 0.7.0", + "mysten-metrics", "once_cell", "prometheus", "sui-json", @@ -12810,7 +12765,7 @@ dependencies = [ "sui-swarm-config", "sui-test-transaction-builder", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "test-cluster", "tokio", "tracing", @@ -12830,7 +12785,7 @@ dependencies = [ "move-binary-format", "move-bytecode-utils", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "schemars", "serde", "serde_json", @@ -12914,7 +12869,7 @@ dependencies = [ "serde", "serde_yaml 0.9.21", "strum_macros 0.24.3", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", "tracing", ] @@ -12941,7 +12896,7 @@ dependencies = [ "move-prover", "move-unit-test", "move-vm-runtime", - "mysten-metrics 0.7.0", + "mysten-metrics", "once_cell", "prometheus", "rand 0.8.5", @@ -12955,7 +12910,7 @@ dependencies = [ "sui-protocol-config", "sui-simulator", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -13081,7 +13036,7 @@ dependencies = [ "fastcrypto-tbls", "futures", "governor", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "prometheus", "rand 0.8.5", @@ -13092,7 +13047,7 @@ dependencies = [ "sui-swarm-config", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tonic 0.11.0", @@ -13119,7 +13074,7 @@ dependencies = [ "humantime", "move-vm-profiler", "mysten-common", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "narwhal-network", "narwhal-worker", @@ -13143,7 +13098,7 @@ dependencies = [ "sui-tls", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", "tower", "tracing", @@ -13197,7 +13152,7 @@ dependencies = [ "clap", "dirs 4.0.0", "jsonpath_lib", - "mysten-metrics 0.7.0", + "mysten-metrics", "once_cell", "prometheus", "rand 0.8.5", @@ -13212,7 +13167,7 @@ dependencies = [ "sui-sdk", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", "tracing", ] @@ -13304,7 +13259,7 @@ dependencies = [ "itertools 0.10.5", "mime", "multiaddr", - "mysten-metrics 0.7.0", + "mysten-metrics", "once_cell", "prometheus", "prost 0.12.3", @@ -13321,7 +13276,7 @@ dependencies = [ "snap", "sui-tls", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", "tower", "tower-http", @@ -13408,7 +13363,7 @@ dependencies = [ "futures", "hyper", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "once_cell", "rand 0.8.5", "reqwest", @@ -13426,7 +13381,7 @@ dependencies = [ "sui-sdk", "sui-swarm-config", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "thiserror", @@ -13457,7 +13412,7 @@ dependencies = [ "sui-keys", "sui-sdk", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "test-cluster", "tokio", "tonic 0.11.0", @@ -13516,7 +13471,7 @@ dependencies = [ "sui-framework", "sui-move-build", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tower", "tracing", @@ -13551,7 +13506,7 @@ dependencies = [ "sui-test-transaction-builder", "sui-transaction-checks", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", "tracing", ] @@ -13632,7 +13587,7 @@ dependencies = [ "move-core-types", "move-package", "move-symbol-pool", - "mysten-metrics 0.7.0", + "mysten-metrics", "prometheus", "reqwest", "serde", @@ -13642,7 +13597,7 @@ dependencies = [ "sui-move-build", "sui-sdk", "sui-source-validation", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "test-cluster", "tokio", @@ -13679,7 +13634,7 @@ dependencies = [ "move-binary-format", "move-bytecode-utils", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "num_cpus", "num_enum 0.6.1", "object_store 0.7.0", @@ -13700,7 +13655,7 @@ dependencies = [ "sui-test-transaction-builder", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -13732,7 +13687,7 @@ dependencies = [ "sui-simulator", "sui-swarm-config", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "test-cluster", "tokio", "tracing", @@ -13744,7 +13699,7 @@ version = "0.0.0" dependencies = [ "anyhow", "futures", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "prometheus", "rand 0.8.5", @@ -13756,7 +13711,7 @@ dependencies = [ "sui-swarm-config", "sui-types", "tap", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tonic-health", @@ -13823,7 +13778,7 @@ dependencies = [ "http", "sui-cluster-test", "sui-faucet", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tokio", "tower", "tower-http", @@ -13894,7 +13849,7 @@ dependencies = [ "sui-snapshot", "sui-storage", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -13973,7 +13928,7 @@ dependencies = [ "sui-storage", "sui-swarm-config", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "typed-store", @@ -14011,7 +13966,7 @@ dependencies = [ "move-vm-profiler", "move-vm-test-utils", "move-vm-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "mysten-network", "narwhal-config", "narwhal-crypto", @@ -14140,7 +14095,7 @@ dependencies = [ "dotenvy", "futures", "move-core-types", - "mysten-metrics 0.7.0", + "mysten-metrics", "notify", "object_store 0.7.0", "prometheus", @@ -14152,7 +14107,7 @@ dependencies = [ "sui-json-rpc", "sui-storage", "sui-types", - "telemetry-subscribers 0.2.0", + "telemetry-subscribers", "tempfile", "tokio", "tracing", @@ -14414,32 +14369,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "telemetry-subscribers" -version = "0.2.0" -source = "git+https://github.com/mystenlabs/sui.git?branch=main#9b991637c51417e4b3c644d56ed674c4ae37972f" -dependencies = [ - "atomic_float", - "bytes", - "bytes-varint", - "clap", - "crossterm", - "futures", - "once_cell", - "opentelemetry 0.20.0", - "opentelemetry-otlp", - "opentelemetry-proto", - "opentelemetry_api 0.20.0", - "prometheus", - "prost 0.11.9", - "tokio", - "tonic 0.9.2", - "tracing", - "tracing-appender", - "tracing-opentelemetry", - "tracing-subscriber", -] - [[package]] name = "tempfile" version = "3.8.0" diff --git a/crates/mysten-service-boilerplate/Cargo.toml b/crates/mysten-service-boilerplate/Cargo.toml index 58014f8a08f47..488f4eb08a209 100644 --- a/crates/mysten-service-boilerplate/Cargo.toml +++ b/crates/mysten-service-boilerplate/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.79" axum = { version = "0.6.6", features = ["macros"] } -mysten-service = { git = "https://github.com/mystenlabs/sui.git", branch = "main", package = "mysten-service" } +mysten-service = { path = "../mysten-service" } prometheus = "0.13.3" tracing = "0.1.40" serde = { version = "1.0.188", features = ["derive"] }