crates: move metrics to crates directory

pelyped · Dec 3, 2021 · 7e4ad08 · 7e4ad08
1 parent 5451612
commit 7e4ad08
Show file tree

Hide file tree

Showing 35 changed files with 26 additions and 26 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,8 +6,6 @@ members = [
     "api/types",
     "common/logger",
     "common/logger/derive",
-    "common/metrics",
-    "common/metrics-core",
     "common/num-variants",
     "common/proptest-helpers",
     "common/rate-limiter",
@@ -36,6 +34,8 @@ members = [
     "crates/diem-id-generator",
     "crates/diem-infallible",
     "crates/diem-json-rpc-client",
+    "crates/diem-metrics",
+    "crates/diem-metrics-core",
     "crates/diem-rest-client",
     "crates/diem-retrier",
     "crates/diem-temppath",

diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -29,7 +29,7 @@ diem-crypto = { path = "../crates/diem-crypto" }
 diem-json-rpc = { path = "../json-rpc" }
 diem-logger = { path = "../common/logger" }
 diem-mempool = { path = "../mempool"}
-diem-metrics = { path = "../common/metrics" }
+diem-metrics = { path = "../crates/diem-metrics" }
 diem-types = { path = "../types" }
 diem-workspace-hack = { path = "../crates/diem-workspace-hack" }
 diem-api-types = { path = "./types", package = "diem-api-types" }

diff --git a/common/rate-limiter/Cargo.toml b/common/rate-limiter/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 diem-infallible = { path= "../../crates/diem-infallible" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
 diem-logger = { path = "../logger" }
-diem-metrics = { path = "../metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 futures = "0.3.12"
 pin-project = "1.0.5"
 tokio = { version = "1.8.1", features = ["full"] }

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -42,7 +42,7 @@ diem-config = { path = "../config" }
 diem-crypto = { path = "../crates/diem-crypto" }
 diem-logger = { path = "../common/logger" }
 diem-mempool = { path = "../mempool" }
-diem-metrics = { path = "../common/metrics" }
+diem-metrics = { path = "../crates/diem-metrics" }
 diem-infallible = { path = "../crates/diem-infallible" }
 diem-secure-storage = { path = "../secure/storage" }
 diem-temppath = { path = "../crates/diem-temppath" }

diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.38"
 futures = "0.3.12"
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-infallible = { path = "../../crates/diem-infallible" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
 

diff --git a/crates/debug-interface/Cargo.toml b/crates/debug-interface/Cargo.toml
@@ -20,5 +20,5 @@ warp = "0.3.0"
 
 diem-config = { path = "../../config" }
 diem-logger = { path = "../../common/logger" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
diff --git a/common/metrics-core/Cargo.toml → crates/diem-metrics-core/Cargo.toml b/common/metrics-core/Cargo.toml → crates/diem-metrics-core/Cargo.toml
diff --git a/common/metrics-core/src/lib.rs → crates/diem-metrics-core/src/lib.rs b/common/metrics-core/src/lib.rs → crates/diem-metrics-core/src/lib.rs
diff --git a/common/metrics/Cargo.toml → crates/diem-metrics/Cargo.toml b/common/metrics/Cargo.toml → crates/diem-metrics/Cargo.toml
@@ -18,8 +18,8 @@ prometheus = { version = "0.12.0", default-features = false }
 serde_json = "1.0.64"
 tokio = { version = "1.8.1", features = ["full"] }
 
-diem-logger = { path = "../logger" }
-diem-metrics-core = { path = "../metrics-core" }
+diem-logger = { path = "../../common/logger" }
+diem-metrics-core = { path = "../diem-metrics-core" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
 
 [dev-dependencies]

diff --git a/common/metrics/build.rs → crates/diem-metrics/build.rs b/common/metrics/build.rs → crates/diem-metrics/build.rs
diff --git a/common/metrics/src/json_encoder.rs → crates/diem-metrics/src/json_encoder.rs b/common/metrics/src/json_encoder.rs → crates/diem-metrics/src/json_encoder.rs
diff --git a/common/metrics/src/json_metrics.rs → crates/diem-metrics/src/json_metrics.rs b/common/metrics/src/json_metrics.rs → crates/diem-metrics/src/json_metrics.rs
diff --git a/common/metrics/src/lib.rs → crates/diem-metrics/src/lib.rs b/common/metrics/src/lib.rs → crates/diem-metrics/src/lib.rs
diff --git a/common/metrics/src/metric_server.rs → crates/diem-metrics/src/metric_server.rs b/common/metrics/src/metric_server.rs → crates/diem-metrics/src/metric_server.rs
diff --git a/common/metrics/src/op_counters.rs → crates/diem-metrics/src/op_counters.rs b/common/metrics/src/op_counters.rs → crates/diem-metrics/src/op_counters.rs
diff --git a/common/metrics/src/public_metrics.rs → crates/diem-metrics/src/public_metrics.rs b/common/metrics/src/public_metrics.rs → crates/diem-metrics/src/public_metrics.rs
diff --git a/common/metrics/src/unit_tests/lib_test.rs → ...s/diem-metrics/src/unit_tests/lib_test.rs b/common/metrics/src/unit_tests/lib_test.rs → ...s/diem-metrics/src/unit_tests/lib_test.rs
diff --git a/common/metrics/src/unit_tests/mod.rs → crates/diem-metrics/src/unit_tests/mod.rs b/common/metrics/src/unit_tests/mod.rs → crates/diem-metrics/src/unit_tests/mod.rs
diff --git a/diem-move/diem-vm/Cargo.toml b/diem-move/diem-vm/Cargo.toml
@@ -20,7 +20,7 @@ tracing = "0.1.16"
 bcs = "0.1.2"
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-logger = { path = "../../common/logger" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-state-view = { path = "../../storage/state-view" }
 diem-types = { path = "../../types" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }

diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml
@@ -39,7 +39,7 @@ diem-genesis-tool = {path = "../config/management/genesis", features = ["testing
 diem-json-rpc = { path = "../json-rpc" }
 diem-logger = { path = "../common/logger" }
 diem-mempool = { path = "../mempool" }
-diem-metrics = { path = "../common/metrics" }
+diem-metrics = { path = "../crates/diem-metrics" }
 diem-secure-storage = { path = "../secure/storage" }
 diem-temppath = { path = "../crates/diem-temppath" }
 diem-time-service = { path = "../crates/diem-time-service" }

diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
@@ -23,7 +23,7 @@ executor-types = { path = "../executor-types" }
 bcs = "0.1.2"
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-logger = { path = "../../common/logger" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-infallible = { path = "../../crates/diem-infallible" }
 diem-secure-net = { path = "../../secure/net" }
 diem-state-view = { path = "../../storage/state-view" }

diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml
@@ -39,7 +39,7 @@ diem-json-rpc-types = { path = "./types", package = "diem-json-rpc-types" }
 diem-infallible = { path = "../crates/diem-infallible" }
 diem-logger = { path = "../common/logger" }
 diem-mempool = { path = "../mempool" }
-diem-metrics = { path = "../common/metrics" }
+diem-metrics = { path = "../crates/diem-metrics" }
 diem-proptest-helpers = { path = "../common/proptest-helpers", optional = true }
 diem-types = { path = "../types" }
 diem-temppath = { path = "../crates/diem-temppath", optional = true }

diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml
@@ -29,7 +29,7 @@ bcs = "0.1.2"
 diem-config = { path = "../config" }
 diem-crypto = { path = "../crates/diem-crypto" }
 diem-logger = { path = "../common/logger" }
-diem-metrics = { path = "../common/metrics" }
+diem-metrics = { path = "../crates/diem-metrics" }
 diem-infallible = { path = "../crates/diem-infallible" }
 diem-proptest-helpers = { path = "../common/proptest-helpers", optional = true }
 diem-types = { path = "../types" }

diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -41,7 +41,7 @@ diem-crypto-derive = { path = "../crates/diem-crypto-derive" }
 diem-id-generator = { path = "../crates/diem-id-generator" }
 diem-infallible = { path = "../crates/diem-infallible" }
 diem-logger = { path = "../common/logger" }
-diem-metrics = { path = "../common/metrics" }
+diem-metrics = { path = "../crates/diem-metrics" }
 diem-proptest-helpers = { path = "../common/proptest-helpers", optional = true }
 diem-rate-limiter = { path = "../common/rate-limiter"}
 diem-time-service = { path = "../crates/diem-time-service", features = ["async"] }

diff --git a/network/discovery/Cargo.toml b/network/discovery/Cargo.toml
@@ -22,7 +22,7 @@ event-notifications = { path = "../../state-sync/inter-component/event-notificat
 diem-config = { path = "../../config"}
 diem-crypto = {path = "../../crates/diem-crypto"}
 diem-logger = {path = "../../common/logger"}
-diem-metrics = {path = "../../common/metrics"}
+diem-metrics = {path = "../../crates/diem-metrics"}
 diem-time-service = {path = "../../crates/diem-time-service"}
 diem-secure-storage = { path = "../../secure/storage" }
 diem-network-address-encryption = {path = "../../config/management/network-address-encryption"}

diff --git a/secure/push-metrics/Cargo.toml b/secure/push-metrics/Cargo.toml
@@ -12,5 +12,5 @@ edition = "2018"
 [dependencies]
 ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false }
 diem-logger = { path = "../../common/logger" }
-diem-metrics-core = { path = "../../common/metrics-core" }
+diem-metrics-core = { path = "../../crates/diem-metrics-core" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml
@@ -30,7 +30,7 @@ diem-crypto = { path = "../../crates/diem-crypto" }
 diem-infallible = { path = "../../crates/diem-infallible" }
 diem-logger = { path = "../../common/logger" }
 diem-mempool = { path = "../../mempool"}
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-proptest-helpers = { path = "../../common/proptest-helpers", optional = true }
 diem-temppath = { path = "../../crates/diem-temppath" }
 diem-types = { path = "../../types" }

diff --git a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml
@@ -26,7 +26,7 @@ diem-data-client = { path = "../../diem-data-client" }
 diem-id-generator = { path = "../../../crates/diem-id-generator" }
 diem-infallible = { path = "../../../crates/diem-infallible" }
 diem-logger = { path = "../../../common/logger" }
-diem-metrics = { path = "../../../common/metrics" }
+diem-metrics = { path = "../../../crates/diem-metrics" }
 diem-types = { path = "../../../types" }
 diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }
 network = { path = "../../../network" }

diff --git a/state-sync/storage-service/server/Cargo.toml b/state-sync/storage-service/server/Cargo.toml
@@ -22,7 +22,7 @@ bounded-executor = { path = "../../../crates/bounded-executor" }
 channel = { path = "../../../crates/channel" }
 diem-config = { path = "../../../config" }
 diem-logger = { path = "../../../common/logger" }
-diem-metrics = { path = "../../../common/metrics" }
+diem-metrics = { path = "../../../crates/diem-metrics" }
 diem-types = { path = "../../../types" }
 diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }
 network = { path = "../../../network" }

diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml
@@ -21,7 +21,7 @@ warp = "0.3.0"
 bcs = "0.1.2"
 diem-crypto = { path = "../../../crates/diem-crypto" }
 diem-logger = { path = "../../../common/logger" }
-diem-metrics = { path = "../../../common/metrics" }
+diem-metrics = { path = "../../../crates/diem-metrics" }
 diem-types = { path = "../../../types" }
 diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }
 diemdb = { path = "../../diemdb" }

diff --git a/storage/diemdb/Cargo.toml b/storage/diemdb/Cargo.toml
@@ -28,7 +28,7 @@ diem-config = { path = "../../config" }
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-jellyfish-merkle = { path = "../jellyfish-merkle" }
 diem-logger = { path = "../../common/logger" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-infallible = { path = "../../crates/diem-infallible" }
 diem-proptest-helpers = { path = "../../common/proptest-helpers", optional = true }
 diem-temppath = { path = "../../crates/diem-temppath", optional = true }

diff --git a/storage/jellyfish-merkle/Cargo.toml b/storage/jellyfish-merkle/Cargo.toml
@@ -27,7 +27,7 @@ bcs = "0.1.2"
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-crypto-derive = { path = "../../crates/diem-crypto-derive" }
 diem-infallible = { path = "../../crates/diem-infallible" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-types = { path = "../../types" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
 storage-interface = { path = "../storage-interface" }

diff --git a/storage/schemadb/Cargo.toml b/storage/schemadb/Cargo.toml
@@ -16,7 +16,7 @@ proptest = {version = "1.0.0", optional = true}
 
 diem-config = { path = "../../config" }
 diem-logger = { path = "../../common/logger" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
 
 [dependencies.rocksdb]

diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml
@@ -19,7 +19,7 @@ diem-config = { path = "../../config" }
 diem-crypto = { path = "../../crates/diem-crypto" }
 diemdb = { path = "../diemdb" }
 diem-logger = { path = "../../common/logger" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-secure-net = { path = "../../secure/net" }
 storage-interface = { path = "../storage-interface" }
 diem-types = { path = "../../types" }

diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml
@@ -33,7 +33,7 @@ diem-wallet = { path = "diem-wallet" }
 diem-client = { path = "../../crates/diem-client" }
 diem-infallible = { path = "../../crates/diem-infallible" }
 diem-logger =  { path = "../../common/logger" }
-diem-metrics = { path = "../../common/metrics" }
+diem-metrics = { path = "../../crates/diem-metrics" }
 diem-types = { path = "../../types" }
 diem-temppath = { path = "../../crates/diem-temppath/" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }