diff --git a/Cargo.toml b/Cargo.toml index 07bcba925cd73..6c4780a8a8344 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,8 +4,6 @@ resolver = "2" members = [ "api", "api/types", - "common/logger", - "common/logger/derive", "config", "config/generate-key", "config/global-constants", @@ -31,6 +29,8 @@ members = [ "crates/diem-id-generator", "crates/diem-infallible", "crates/diem-json-rpc-client", + "crates/diem-log-derive", + "crates/diem-logger", "crates/diem-metrics", "crates/diem-metrics-core", "crates/diem-proptest-helpers", diff --git a/api/Cargo.toml b/api/Cargo.toml index 524382bf7f426..d5a396a106bb1 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -27,7 +27,7 @@ warp = { version = "0.3.0", features = ["default"] } diem-config = { path = "../config" } diem-crypto = { path = "../crates/diem-crypto" } diem-json-rpc = { path = "../json-rpc" } -diem-logger = { path = "../common/logger" } +diem-logger = { path = "../crates/diem-logger" } diem-mempool = { path = "../mempool"} diem-metrics = { path = "../crates/diem-metrics" } diem-types = { path = "../types" } diff --git a/config/Cargo.toml b/config/Cargo.toml index 563ab5d247bdd..e28de1e17b441 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -22,7 +22,7 @@ bcs = "0.1.2" diem-crypto = { path = "../crates/diem-crypto" } diem-crypto-derive = { path = "../crates/diem-crypto-derive" } diem-global-constants = { path = "./global-constants"} -diem-logger = { path = "../common/logger" } +diem-logger = { path = "../crates/diem-logger" } diem-network-address-encryption = { path = "management/network-address-encryption" } diem-secure-storage = { path = "../secure/storage" } diem-temppath = { path = "../crates/diem-temppath" } diff --git a/config/management/network-address-encryption/Cargo.toml b/config/management/network-address-encryption/Cargo.toml index 43a6750d6fbcb..115fd717851ae 100644 --- a/config/management/network-address-encryption/Cargo.toml +++ b/config/management/network-address-encryption/Cargo.toml @@ -17,7 +17,7 @@ thiserror = "1.0.24" bcs = "0.1.2" diem-global-constants = { path = "../../global-constants"} diem-infallible = { path = "../../../crates/diem-infallible" } -diem-logger = { path = "../../../common/logger" } +diem-logger = { path = "../../../crates/diem-logger" } diem-secure-storage = { path = "../../../secure/storage" } diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" } diff --git a/config/seed-peer-generator/Cargo.toml b/config/seed-peer-generator/Cargo.toml index 16f41b41bf18a..7789e95241465 100644 --- a/config/seed-peer-generator/Cargo.toml +++ b/config/seed-peer-generator/Cargo.toml @@ -21,7 +21,7 @@ bcs = "0.1.2" diem-config = { path = ".." } diem-crypto = { path = "../../crates/diem-crypto" } diem-client = { path = "../../crates/diem-client", features = ["blocking"], default-features = false } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-temppath = { path = "../../crates/diem-temppath" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index 69040fa30cfe6..407e21e9cf3de 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -40,7 +40,7 @@ fallible = { path = "../crates/fallible" } bcs = "0.1.2" diem-config = { path = "../config" } diem-crypto = { path = "../crates/diem-crypto" } -diem-logger = { path = "../common/logger" } +diem-logger = { path = "../crates/diem-logger" } diem-mempool = { path = "../mempool" } diem-metrics = { path = "../crates/diem-metrics" } diem-infallible = { path = "../crates/diem-infallible" } diff --git a/consensus/safety-rules/Cargo.toml b/consensus/safety-rules/Cargo.toml index ecc1f728ea76f..83c3e37029d26 100644 --- a/consensus/safety-rules/Cargo.toml +++ b/consensus/safety-rules/Cargo.toml @@ -18,7 +18,7 @@ diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-global-constants = { path = "../../config/global-constants"} diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers", optional = true } diem-secure-net = { path = "../../secure/net" } diem-secure-push-metrics = { path = "../../secure/push-metrics" } diff --git a/crates/crash-handler/Cargo.toml b/crates/crash-handler/Cargo.toml index 3c1e866a8e97d..27161f647591c 100644 --- a/crates/crash-handler/Cargo.toml +++ b/crates/crash-handler/Cargo.toml @@ -13,6 +13,6 @@ edition = "2018" backtrace = "0.3.56" toml = "0.5.8" -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } serde = { version = "1.0.124", features = ["derive"] } diff --git a/crates/debug-interface/Cargo.toml b/crates/debug-interface/Cargo.toml index ec3821e2954d6..947b0cb893ee7 100644 --- a/crates/debug-interface/Cargo.toml +++ b/crates/debug-interface/Cargo.toml @@ -19,6 +19,6 @@ tokio = { version = "1.8.1", features = ["full"] } warp = "0.3.0" diem-config = { path = "../../config" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/crates/diem-faucet/Cargo.toml b/crates/diem-faucet/Cargo.toml index 3fbb813061451..35a5bf64b7bb8 100644 --- a/crates/diem-faucet/Cargo.toml +++ b/crates/diem-faucet/Cargo.toml @@ -21,7 +21,7 @@ tokio = { version = "1.8.1", features = ["full"] } warp = "0.3.0" generate-key = { path = "../../config/generate-key" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-sdk = { path = "../../sdk" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/common/logger/derive/Cargo.toml b/crates/diem-log-derive/Cargo.toml similarity index 84% rename from common/logger/derive/Cargo.toml rename to crates/diem-log-derive/Cargo.toml index 922c932485d7c..a2e7273e329d4 100644 --- a/common/logger/derive/Cargo.toml +++ b/crates/diem-log-derive/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" proc-macro = true [dependencies] -diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" } +diem-workspace-hack = { path = "../diem-workspace-hack" } syn = { version = "1.0.64", features = ["extra-traits"] } quote = "1.0.9" proc-macro2 = "1.0.24" diff --git a/common/logger/derive/src/lib.rs b/crates/diem-log-derive/src/lib.rs similarity index 100% rename from common/logger/derive/src/lib.rs rename to crates/diem-log-derive/src/lib.rs diff --git a/common/logger/Cargo.toml b/crates/diem-logger/Cargo.toml similarity index 81% rename from common/logger/Cargo.toml rename to crates/diem-logger/Cargo.toml index 6a433391b8392..1678df40e2123 100644 --- a/common/logger/Cargo.toml +++ b/crates/diem-logger/Cargo.toml @@ -16,9 +16,9 @@ backtrace = { version = "0.3", features = ["serde"] } chrono = "0.4.19" erased-serde = "0.3.13" hostname = "0.3.1" -diem-log-derive = { path = "derive" } -diem-infallible = { path = "../../crates/diem-infallible" } -diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } +diem-log-derive = { path = "../diem-log-derive" } +diem-infallible = { path = "../diem-infallible" } +diem-workspace-hack = { path = "../diem-workspace-hack" } once_cell = "1.7.2" serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" diff --git a/common/logger/src/counters.rs b/crates/diem-logger/src/counters.rs similarity index 100% rename from common/logger/src/counters.rs rename to crates/diem-logger/src/counters.rs diff --git a/common/logger/src/diem_logger.rs b/crates/diem-logger/src/diem_logger.rs similarity index 100% rename from common/logger/src/diem_logger.rs rename to crates/diem-logger/src/diem_logger.rs diff --git a/common/logger/src/event.rs b/crates/diem-logger/src/event.rs similarity index 100% rename from common/logger/src/event.rs rename to crates/diem-logger/src/event.rs diff --git a/common/logger/src/filter.rs b/crates/diem-logger/src/filter.rs similarity index 100% rename from common/logger/src/filter.rs rename to crates/diem-logger/src/filter.rs diff --git a/common/logger/src/json_log.rs b/crates/diem-logger/src/json_log.rs similarity index 100% rename from common/logger/src/json_log.rs rename to crates/diem-logger/src/json_log.rs diff --git a/common/logger/src/kv.rs b/crates/diem-logger/src/kv.rs similarity index 100% rename from common/logger/src/kv.rs rename to crates/diem-logger/src/kv.rs diff --git a/common/logger/src/lib.rs b/crates/diem-logger/src/lib.rs similarity index 100% rename from common/logger/src/lib.rs rename to crates/diem-logger/src/lib.rs diff --git a/common/logger/src/logger.rs b/crates/diem-logger/src/logger.rs similarity index 100% rename from common/logger/src/logger.rs rename to crates/diem-logger/src/logger.rs diff --git a/common/logger/src/macros.rs b/crates/diem-logger/src/macros.rs similarity index 100% rename from common/logger/src/macros.rs rename to crates/diem-logger/src/macros.rs diff --git a/common/logger/src/metadata.rs b/crates/diem-logger/src/metadata.rs similarity index 100% rename from common/logger/src/metadata.rs rename to crates/diem-logger/src/metadata.rs diff --git a/common/logger/src/sample.rs b/crates/diem-logger/src/sample.rs similarity index 100% rename from common/logger/src/sample.rs rename to crates/diem-logger/src/sample.rs diff --git a/common/logger/src/security.rs b/crates/diem-logger/src/security.rs similarity index 100% rename from common/logger/src/security.rs rename to crates/diem-logger/src/security.rs diff --git a/common/logger/src/struct_log.rs b/crates/diem-logger/src/struct_log.rs similarity index 100% rename from common/logger/src/struct_log.rs rename to crates/diem-logger/src/struct_log.rs diff --git a/common/logger/src/tracing_adapter.rs b/crates/diem-logger/src/tracing_adapter.rs similarity index 100% rename from common/logger/src/tracing_adapter.rs rename to crates/diem-logger/src/tracing_adapter.rs diff --git a/common/logger/tests/derive.rs b/crates/diem-logger/tests/derive.rs similarity index 100% rename from common/logger/tests/derive.rs rename to crates/diem-logger/tests/derive.rs diff --git a/common/logger/tests/logger.rs b/crates/diem-logger/tests/logger.rs similarity index 100% rename from common/logger/tests/logger.rs rename to crates/diem-logger/tests/logger.rs diff --git a/common/logger/tests/logger_custom_format.rs b/crates/diem-logger/tests/logger_custom_format.rs similarity index 100% rename from common/logger/tests/logger_custom_format.rs rename to crates/diem-logger/tests/logger_custom_format.rs diff --git a/common/logger/tests/remote.rs b/crates/diem-logger/tests/remote.rs similarity index 100% rename from common/logger/tests/remote.rs rename to crates/diem-logger/tests/remote.rs diff --git a/common/logger/tests/tracing_translation_tests.rs b/crates/diem-logger/tests/tracing_translation_tests.rs similarity index 100% rename from common/logger/tests/tracing_translation_tests.rs rename to crates/diem-logger/tests/tracing_translation_tests.rs diff --git a/crates/diem-metrics/Cargo.toml b/crates/diem-metrics/Cargo.toml index c1926be35d9a7..4bed1eb26e09e 100644 --- a/crates/diem-metrics/Cargo.toml +++ b/crates/diem-metrics/Cargo.toml @@ -18,7 +18,7 @@ prometheus = { version = "0.12.0", default-features = false } serde_json = "1.0.64" tokio = { version = "1.8.1", features = ["full"] } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics-core = { path = "../diem-metrics-core" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/crates/diem-rate-limiter/Cargo.toml b/crates/diem-rate-limiter/Cargo.toml index a70b5678b69e8..5a2cc6d84e5d4 100644 --- a/crates/diem-rate-limiter/Cargo.toml +++ b/crates/diem-rate-limiter/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] diem-infallible = { path= "../../crates/diem-infallible" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } futures = "0.3.12" pin-project = "1.0.5" diff --git a/crates/diem-retrier/Cargo.toml b/crates/diem-retrier/Cargo.toml index 8328816132aa6..058d2440d3866 100644 --- a/crates/diem-retrier/Cargo.toml +++ b/crates/diem-retrier/Cargo.toml @@ -12,4 +12,4 @@ edition = "2018" [dependencies] diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } tokio = { version = "1.8.1", features = ["time"] } -diem-logger = { path = "../../common/logger"} +diem-logger = { path = "../../crates/diem-logger"} diff --git a/crates/transaction-emitter/Cargo.toml b/crates/transaction-emitter/Cargo.toml index 20ff29867bfa7..eb75d5bc651d1 100644 --- a/crates/transaction-emitter/Cargo.toml +++ b/crates/transaction-emitter/Cargo.toml @@ -23,6 +23,6 @@ tokio = { version = "1.8.1", features = ["full"] } diem-client = { path = "../diem-client"} diem-config = { path = "../../config" } diem-crypto = { path = "../diem-crypto" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-sdk = { path = "../../sdk" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/diem-move/diem-vm/Cargo.toml b/diem-move/diem-vm/Cargo.toml index 0d534a2f2f25d..c18d1ba477cda 100644 --- a/diem-move/diem-vm/Cargo.toml +++ b/diem-move/diem-vm/Cargo.toml @@ -19,7 +19,7 @@ tracing = "0.1.16" bcs = "0.1.2" diem-crypto = { path = "../../crates/diem-crypto" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } diem-state-view = { path = "../../storage/state-view" } diem-types = { path = "../../types" } diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml index f1cb5d34fda9d..0b97a93dedf3f 100644 --- a/diem-node/Cargo.toml +++ b/diem-node/Cargo.toml @@ -37,7 +37,7 @@ diem-data-client = { path = "../state-sync/diem-data-client" } diem-framework-releases = { path = "../diem-move/diem-framework/DPN/releases" } diem-genesis-tool = {path = "../config/management/genesis", features = ["testing"] } diem-json-rpc = { path = "../json-rpc" } -diem-logger = { path = "../common/logger" } +diem-logger = { path = "../crates/diem-logger" } diem-mempool = { path = "../mempool" } diem-metrics = { path = "../crates/diem-metrics" } diem-secure-storage = { path = "../secure/storage" } diff --git a/execution/execution-correctness/Cargo.toml b/execution/execution-correctness/Cargo.toml index 97dad883c7f8d..8d2e7b2b398f4 100644 --- a/execution/execution-correctness/Cargo.toml +++ b/execution/execution-correctness/Cargo.toml @@ -17,7 +17,7 @@ bcs = "0.1.2" diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-global-constants = { path = "../../config/global-constants"} -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-infallible = { path = "../../crates/diem-infallible" } diem-secure-net = { path = "../../secure/net" } diem-secure-storage = { path = "../../secure/storage" } diff --git a/execution/executor-benchmark/Cargo.toml b/execution/executor-benchmark/Cargo.toml index 43d31a401ef68..0cf66f3f2b031 100644 --- a/execution/executor-benchmark/Cargo.toml +++ b/execution/executor-benchmark/Cargo.toml @@ -29,7 +29,7 @@ diem-crypto = { path = "../../crates/diem-crypto" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-infallible = { path = "../../crates/diem-infallible" } diem-jellyfish-merkle = { path = "../../storage/jellyfish-merkle" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-types = { path = "../../types" } diem-vm= { path = "../../diem-move/diem-vm" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml index f64f2bb0797d6..0e21f4892f1dd 100644 --- a/execution/executor/Cargo.toml +++ b/execution/executor/Cargo.toml @@ -22,7 +22,7 @@ consensus-types = { path = "../../consensus/consensus-types"} executor-types = { path = "../executor-types" } bcs = "0.1.2" diem-crypto = { path = "../../crates/diem-crypto" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } diem-infallible = { path = "../../crates/diem-infallible" } diem-secure-net = { path = "../../secure/net" } diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml index cfd13f0530504..07a3c63d93a29 100644 --- a/json-rpc/Cargo.toml +++ b/json-rpc/Cargo.toml @@ -37,7 +37,7 @@ diemdb = { path = "../storage/diemdb", optional = true } diem-id-generator = { path = "../crates/diem-id-generator" } diem-json-rpc-types = { path = "./types", package = "diem-json-rpc-types" } diem-infallible = { path = "../crates/diem-infallible" } -diem-logger = { path = "../common/logger" } +diem-logger = { path = "../crates/diem-logger" } diem-mempool = { path = "../mempool" } diem-metrics = { path = "../crates/diem-metrics" } diem-proptest-helpers = { path = "../crates/diem-proptest-helpers", optional = true } diff --git a/language/e2e-testsuite/Cargo.toml b/language/e2e-testsuite/Cargo.toml index 03ee78d12faa5..4df095e6db644 100644 --- a/language/e2e-testsuite/Cargo.toml +++ b/language/e2e-testsuite/Cargo.toml @@ -26,7 +26,7 @@ diem-transaction-builder = { path = "../../sdk/transaction-builder"} move-binary-format = { path = "../move-binary-format" } diem-vm = { path = "../../diem-move/diem-vm" } proptest = "1.0.0" -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } diem-writeset-generator = { path = "../../diem-move/writeset-transaction-generator"} diem-state-view = { path = "../../storage/state-view" } diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index 9fa53dbfc6d8f..45e26643a0d4e 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -28,7 +28,7 @@ channel = { path = "../crates/channel" } bcs = "0.1.2" diem-config = { path = "../config" } diem-crypto = { path = "../crates/diem-crypto" } -diem-logger = { path = "../common/logger" } +diem-logger = { path = "../crates/diem-logger" } diem-metrics = { path = "../crates/diem-metrics" } diem-infallible = { path = "../crates/diem-infallible" } diem-proptest-helpers = { path = "../crates/diem-proptest-helpers", optional = true } diff --git a/network/Cargo.toml b/network/Cargo.toml index f3a58b4c7c653..1b448aa7f4765 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -40,7 +40,7 @@ diem-crypto = { path = "../crates/diem-crypto" } 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-logger = { path = "../crates/diem-logger" } diem-metrics = { path = "../crates/diem-metrics" } diem-proptest-helpers = { path = "../crates/diem-proptest-helpers", optional = true } diem-rate-limiter = { path = "../crates/diem-rate-limiter"} diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml index 7c4e42cca911a..1a21539157b27 100644 --- a/network/builder/Cargo.toml +++ b/network/builder/Cargo.toml @@ -23,7 +23,7 @@ bcs = "0.1.2" diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-network-address-encryption = {path = "../../config/management/network-address-encryption"} diem-secure-storage = { path = "../../secure/storage" } diem-time-service = { path = "../../crates/diem-time-service", features = ["async"] } diff --git a/network/discovery/Cargo.toml b/network/discovery/Cargo.toml index 3f5ae8ef93c1c..da529cee6e1d6 100644 --- a/network/discovery/Cargo.toml +++ b/network/discovery/Cargo.toml @@ -21,7 +21,7 @@ bcs = "0.1.2" event-notifications = { path = "../../state-sync/inter-component/event-notifications" } diem-config = { path = "../../config"} diem-crypto = {path = "../../crates/diem-crypto"} -diem-logger = {path = "../../common/logger"} +diem-logger = {path = "../../crates/diem-logger"} diem-metrics = {path = "../../crates/diem-metrics"} diem-time-service = {path = "../../crates/diem-time-service"} diem-secure-storage = { path = "../../secure/storage" } diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml index ecde23d2fea8d..29e2768a9b14e 100644 --- a/network/netcore/Cargo.toml +++ b/network/netcore/Cargo.toml @@ -24,7 +24,7 @@ memsocket = { path = "../memsocket", optional = true } proxy = { path = "../../crates/proxy" } [dev-dependencies] -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } memsocket = { path = "../memsocket" } [features] diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml index 15d8754126059..412a2e3a7316a 100644 --- a/network/socket-bench-server/Cargo.toml +++ b/network/socket-bench-server/Cargo.toml @@ -16,7 +16,7 @@ tokio-util = { version = "0.6.4", features = ["compat", "codec"] } diem-crypto = { path = "../../crates/diem-crypto" } diem-config = { path = "../../config" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } memsocket = { path = "../memsocket" } diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml index a6abdfac2225d..3bc57c9881d22 100644 --- a/secure/key-manager/Cargo.toml +++ b/secure/key-manager/Cargo.toml @@ -20,7 +20,7 @@ crash-handler = { path = "../../crates/crash-handler" } diem-config = { path = "../../config"} diem-crypto = { path = "../../crates/diem-crypto" } diem-global-constants = { path = "../../config/global-constants"} -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-client = { path = "../../crates/diem-client", features = ["blocking"], default-features = false } diem-secure-push-metrics = { path = "../push-metrics" } diem-secure-storage = { path = "../storage" } diff --git a/secure/net/Cargo.toml b/secure/net/Cargo.toml index 405981f12f23b..929f628aa5cc3 100644 --- a/secure/net/Cargo.toml +++ b/secure/net/Cargo.toml @@ -14,7 +14,7 @@ once_cell = "1.7.2" serde = { version = "1.0.124", features = ["rc"], default-features = false } thiserror = "1.0.24" -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-secure-push-metrics = { path = "../push-metrics" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/secure/push-metrics/Cargo.toml b/secure/push-metrics/Cargo.toml index 5c67ec095b330..7415093feb769 100644 --- a/secure/push-metrics/Cargo.toml +++ b/secure/push-metrics/Cargo.toml @@ -11,6 +11,6 @@ edition = "2018" [dependencies] ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics-core = { path = "../../crates/diem-metrics-core" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/secure/storage/Cargo.toml b/secure/storage/Cargo.toml index 0d18af921e09b..baeac7274f6c4 100644 --- a/secure/storage/Cargo.toml +++ b/secure/storage/Cargo.toml @@ -22,7 +22,7 @@ bcs = "0.1.2" diem-crypto = { path = "../../crates/diem-crypto" } diem-github-client = { path = "github" } diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-temppath = { path = "../../crates/diem-temppath" } diem-time-service = { path = "../../crates/diem-time-service" } diem-vault-client = { path = "vault" } diff --git a/state-sync/diem-data-client/Cargo.toml b/state-sync/diem-data-client/Cargo.toml index ea9899384228d..96398faa49cdf 100644 --- a/state-sync/diem-data-client/Cargo.toml +++ b/state-sync/diem-data-client/Cargo.toml @@ -21,7 +21,7 @@ diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-id-generator = { path = "../../crates/diem-id-generator" } diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-time-service = { path = "../../crates/diem-time-service", features = ["async"] } diem-types = { path = "../../types" } 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 index 1f524777ff598..e668323b4d23a 100644 --- a/state-sync/state-sync-v1/Cargo.toml +++ b/state-sync/state-sync-v1/Cargo.toml @@ -28,7 +28,7 @@ channel = { path = "../../crates/channel" } diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-mempool = { path = "../../mempool"} diem-metrics = { path = "../../crates/diem-metrics" } diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers", optional = true } diff --git a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml index d3cbd703a3726..996a72b011c43 100644 --- a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml +++ b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml @@ -25,7 +25,7 @@ diem-crypto = { path = "../../../crates/diem-crypto" } 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-logger = { path = "../../../crates/diem-logger" } diem-metrics = { path = "../../../crates/diem-metrics" } diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" } diff --git a/state-sync/storage-service/server/Cargo.toml b/state-sync/storage-service/server/Cargo.toml index 696ed2d741a45..4c79b39319c14 100644 --- a/state-sync/storage-service/server/Cargo.toml +++ b/state-sync/storage-service/server/Cargo.toml @@ -21,7 +21,7 @@ tokio = { version = "1.8.1", features = ["rt", "macros"], default-features = fal bounded-executor = { path = "../../../crates/bounded-executor" } channel = { path = "../../../crates/channel" } diem-config = { path = "../../../config" } -diem-logger = { path = "../../../common/logger" } +diem-logger = { path = "../../../crates/diem-logger" } diem-metrics = { path = "../../../crates/diem-metrics" } diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 69c740a7b336a..09a3b03050d2b 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -38,7 +38,7 @@ bcs = "0.1.2" diem-config = { path = "../../../config" } diem-crypto = { path = "../../../crates/diem-crypto" } diem-infallible = { path = "../../../crates/diem-infallible" } -diem-logger = { path = "../../../common/logger" } +diem-logger = { path = "../../../crates/diem-logger" } diem-secure-push-metrics = { path = "../../../secure/push-metrics" } diem-temppath = { path = "../../../crates/diem-temppath" } diem-types = { path = "../../../types" } diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 8f445e7871070..233d23ecfe79a 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -20,7 +20,7 @@ warp = "0.3.0" bcs = "0.1.2" diem-crypto = { path = "../../../crates/diem-crypto" } -diem-logger = { path = "../../../common/logger" } +diem-logger = { path = "../../../crates/diem-logger" } diem-metrics = { path = "../../../crates/diem-metrics" } diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" } diff --git a/storage/diemdb/Cargo.toml b/storage/diemdb/Cargo.toml index d2a770cf08ae2..d312d2df723c5 100644 --- a/storage/diemdb/Cargo.toml +++ b/storage/diemdb/Cargo.toml @@ -27,7 +27,7 @@ bcs = "0.1.2" diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-jellyfish-merkle = { path = "../jellyfish-merkle" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } diem-infallible = { path = "../../crates/diem-infallible" } diem-proptest-helpers = { path = "../../crates/diem-proptest-helpers", optional = true } diff --git a/storage/inspector/Cargo.toml b/storage/inspector/Cargo.toml index 9df252275ce6e..dde220b8ecc4e 100644 --- a/storage/inspector/Cargo.toml +++ b/storage/inspector/Cargo.toml @@ -18,6 +18,6 @@ diemdb = { path = "../diemdb" } diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } 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 index eb308b9f14182..66a2eb2be6fc0 100644 --- a/storage/schemadb/Cargo.toml +++ b/storage/schemadb/Cargo.toml @@ -15,7 +15,7 @@ once_cell = "1.7.2" proptest = {version = "1.0.0", optional = true} diem-config = { path = "../../config" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } diff --git a/storage/scratchpad-benchmark/Cargo.toml b/storage/scratchpad-benchmark/Cargo.toml index 90c287ac7a538..8ef0544a9c8b4 100644 --- a/storage/scratchpad-benchmark/Cargo.toml +++ b/storage/scratchpad-benchmark/Cargo.toml @@ -22,7 +22,7 @@ diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } executor-types = { path = "../../execution/executor-types" } diff --git a/storage/storage-client/Cargo.toml b/storage/storage-client/Cargo.toml index 544b8c8342fd4..d34e5c96a873f 100644 --- a/storage/storage-client/Cargo.toml +++ b/storage/storage-client/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0.124" bcs = "0.1.2" diem-crypto = { path = "../../crates/diem-crypto" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-infallible = { path = "../../crates/diem-infallible" } diem-secure-net = { path = "../../secure/net" } diem-types = { path = "../../types" } diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml index 8a036747dffba..e97ad9cfb3090 100644 --- a/storage/storage-service/Cargo.toml +++ b/storage/storage-service/Cargo.toml @@ -18,7 +18,7 @@ bcs = "0.1.2" diem-config = { path = "../../config" } diem-crypto = { path = "../../crates/diem-crypto" } diemdb = { path = "../diemdb" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } diem-secure-net = { path = "../../secure/net" } storage-interface = { path = "../storage-interface" } diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml index 8690eb719165c..901df1589579b 100644 --- a/testsuite/cli/Cargo.toml +++ b/testsuite/cli/Cargo.toml @@ -32,7 +32,7 @@ bcs = "0.1.2" diem-wallet = { path = "diem-wallet" } diem-client = { path = "../../crates/diem-client" } diem-infallible = { path = "../../crates/diem-infallible" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-metrics = { path = "../../crates/diem-metrics" } diem-types = { path = "../../types" } diem-temppath = { path = "../../crates/diem-temppath/" } diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml index 9d89f24f34868..6891fa0fdc34b 100644 --- a/testsuite/cluster-test/Cargo.toml +++ b/testsuite/cluster-test/Cargo.toml @@ -43,7 +43,7 @@ diem-config = { path = "../../config" } diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } diem-genesis-tool = { path = "../../config/management/genesis", features = ["testing"] } diem-global-constants = { path = "../../config/global-constants" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-management = { path = "../../config/management", features = ["testing"] } diem-mempool = { path = "../../mempool" } diem-infallible = { path = "../../crates/diem-infallible" } diff --git a/testsuite/diem-swarm/Cargo.toml b/testsuite/diem-swarm/Cargo.toml index 600ad74d297fe..a3e4955f4d064 100644 --- a/testsuite/diem-swarm/Cargo.toml +++ b/testsuite/diem-swarm/Cargo.toml @@ -19,7 +19,7 @@ thiserror = "1.0.24" diem-config = { path = "../../config", features = ["fuzzing"] } diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases"} debug-interface = { path = "../../crates/debug-interface" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-temppath = { path = "../../crates/diem-temppath" } diem-types = { path = "../../types" } diff --git a/testsuite/forge/Cargo.toml b/testsuite/forge/Cargo.toml index 95ca57722cb9e..eb67b506e6900 100644 --- a/testsuite/forge/Cargo.toml +++ b/testsuite/forge/Cargo.toml @@ -40,7 +40,7 @@ debug-interface = { path = "../../crates/debug-interface" } diem-config = { path = "../../config" } diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } diem-genesis-tool = { path = "../../config/management/genesis" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-retrier = { path = "../../crates/diem-retrier" } diem-sdk = { path = "../../sdk" } diem-secure-storage = { path = "../../secure/storage" } diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml index 924ce1c664d61..7377b2ffd257b 100644 --- a/testsuite/smoke-test/Cargo.toml +++ b/testsuite/smoke-test/Cargo.toml @@ -50,7 +50,7 @@ diem-infallible = { path = "../../crates/diem-infallible" } diem-json-rpc = { path = "../../json-rpc" } diem-json-rpc-types = { path = "../../json-rpc/types" } diem-key-manager = { path = "../../secure/key-manager" } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-management = { path = "../../config/management", features = ["testing"] } diem-operational-tool = {path = "../../config/management/operational", features = ["testing"] } diem-secure-storage = { path = "../../secure/storage", features = ["testing"] } diff --git a/testsuite/testcases/Cargo.toml b/testsuite/testcases/Cargo.toml index b347b204d43c5..9da76d02a18ab 100644 --- a/testsuite/testcases/Cargo.toml +++ b/testsuite/testcases/Cargo.toml @@ -17,7 +17,7 @@ diem-operational-tool = {path = "../../config/management/operational", features forge = { path = "../forge" } rand = "0.8.3" tokio = { version = "1.8.1", features = ["full"] } -diem-logger = { path = "../../common/logger" } +diem-logger = { path = "../../crates/diem-logger" } diem-workspace-hack = { path = "../../crates/diem-workspace-hack" } [[test]]