crates: move diem-logger to crates directory

Closes: aptos-labs#9933
CLIN931 · Dec 3, 2021 · cddc1ab · cddc1ab
1 parent c6e2455
commit cddc1ab
Show file tree

Hide file tree

Showing 71 changed files with 54 additions and 54 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → crates/diem-log-derive/Cargo.toml b/common/logger/derive/Cargo.toml → 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 → crates/diem-log-derive/src/lib.rs b/common/logger/derive/src/lib.rs → crates/diem-log-derive/src/lib.rs
diff --git a/common/logger/Cargo.toml → crates/diem-logger/Cargo.toml b/common/logger/Cargo.toml → 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 → crates/diem-logger/src/counters.rs b/common/logger/src/counters.rs → crates/diem-logger/src/counters.rs
diff --git a/common/logger/src/diem_logger.rs → crates/diem-logger/src/diem_logger.rs b/common/logger/src/diem_logger.rs → crates/diem-logger/src/diem_logger.rs
diff --git a/common/logger/src/event.rs → crates/diem-logger/src/event.rs b/common/logger/src/event.rs → crates/diem-logger/src/event.rs
diff --git a/common/logger/src/filter.rs → crates/diem-logger/src/filter.rs b/common/logger/src/filter.rs → crates/diem-logger/src/filter.rs
diff --git a/common/logger/src/json_log.rs → crates/diem-logger/src/json_log.rs b/common/logger/src/json_log.rs → crates/diem-logger/src/json_log.rs
diff --git a/common/logger/src/kv.rs → crates/diem-logger/src/kv.rs b/common/logger/src/kv.rs → crates/diem-logger/src/kv.rs
diff --git a/common/logger/src/lib.rs → crates/diem-logger/src/lib.rs b/common/logger/src/lib.rs → crates/diem-logger/src/lib.rs
diff --git a/common/logger/src/logger.rs → crates/diem-logger/src/logger.rs b/common/logger/src/logger.rs → crates/diem-logger/src/logger.rs
diff --git a/common/logger/src/macros.rs → crates/diem-logger/src/macros.rs b/common/logger/src/macros.rs → crates/diem-logger/src/macros.rs
diff --git a/common/logger/src/metadata.rs → crates/diem-logger/src/metadata.rs b/common/logger/src/metadata.rs → crates/diem-logger/src/metadata.rs
diff --git a/common/logger/src/sample.rs → crates/diem-logger/src/sample.rs b/common/logger/src/sample.rs → crates/diem-logger/src/sample.rs
diff --git a/common/logger/src/security.rs → crates/diem-logger/src/security.rs b/common/logger/src/security.rs → crates/diem-logger/src/security.rs
diff --git a/common/logger/src/struct_log.rs → crates/diem-logger/src/struct_log.rs b/common/logger/src/struct_log.rs → crates/diem-logger/src/struct_log.rs
diff --git a/common/logger/src/tracing_adapter.rs → crates/diem-logger/src/tracing_adapter.rs b/common/logger/src/tracing_adapter.rs → crates/diem-logger/src/tracing_adapter.rs
diff --git a/common/logger/tests/derive.rs → crates/diem-logger/tests/derive.rs b/common/logger/tests/derive.rs → crates/diem-logger/tests/derive.rs
diff --git a/common/logger/tests/logger.rs → crates/diem-logger/tests/logger.rs b/common/logger/tests/logger.rs → crates/diem-logger/tests/logger.rs
diff --git a/common/logger/tests/logger_custom_format.rs → ...diem-logger/tests/logger_custom_format.rs b/common/logger/tests/logger_custom_format.rs → ...diem-logger/tests/logger_custom_format.rs
diff --git a/common/logger/tests/remote.rs → crates/diem-logger/tests/remote.rs b/common/logger/tests/remote.rs → crates/diem-logger/tests/remote.rs
diff --git a/...logger/tests/tracing_translation_tests.rs → ...logger/tests/tracing_translation_tests.rs b/...logger/tests/tracing_translation_tests.rs → ...logger/tests/tracing_translation_tests.rs
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" }