diff --git a/Cargo.lock b/Cargo.lock index f82ba50de..5a0fdb440 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -907,7 +907,7 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heatmap" version = "0.0.0" -source = "git+https://github.com/twitter/rustcommon?rev=87e0c87#87e0c87cc8ad42466ec0eeba0fee8742325e52c0" +source = "git+https://github.com/twitter/rustcommon?rev=d550e01#d550e01d3aeb7b334ed44e87652706acb5b3aea8" dependencies = [ "histogram", "rustcommon-time", @@ -935,7 +935,7 @@ dependencies = [ [[package]] name = "histogram" version = "0.0.0" -source = "git+https://github.com/twitter/rustcommon?rev=87e0c87#87e0c87cc8ad42466ec0eeba0fee8742325e52c0" +source = "git+https://github.com/twitter/rustcommon?rev=d550e01#d550e01d3aeb7b334ed44e87652706acb5b3aea8" dependencies = [ "thiserror", ] @@ -2032,7 +2032,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustcommon-logger" version = "0.1.1" -source = "git+https://github.com/twitter/rustcommon?rev=87e0c87#87e0c87cc8ad42466ec0eeba0fee8742325e52c0" +source = "git+https://github.com/twitter/rustcommon?rev=d550e01#d550e01d3aeb7b334ed44e87652706acb5b3aea8" dependencies = [ "ahash", "log", @@ -2044,7 +2044,7 @@ dependencies = [ [[package]] name = "rustcommon-metrics" version = "0.1.2" -source = "git+https://github.com/twitter/rustcommon?rev=87e0c87#87e0c87cc8ad42466ec0eeba0fee8742325e52c0" +source = "git+https://github.com/twitter/rustcommon?rev=d550e01#d550e01d3aeb7b334ed44e87652706acb5b3aea8" dependencies = [ "heatmap", "linkme", @@ -2057,7 +2057,7 @@ dependencies = [ [[package]] name = "rustcommon-metrics-derive" version = "0.1.1" -source = "git+https://github.com/twitter/rustcommon?rev=87e0c87#87e0c87cc8ad42466ec0eeba0fee8742325e52c0" +source = "git+https://github.com/twitter/rustcommon?rev=d550e01#d550e01d3aeb7b334ed44e87652706acb5b3aea8" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2068,7 +2068,7 @@ dependencies = [ [[package]] name = "rustcommon-time" version = "0.0.13" -source = "git+https://github.com/twitter/rustcommon?rev=87e0c87#87e0c87cc8ad42466ec0eeba0fee8742325e52c0" +source = "git+https://github.com/twitter/rustcommon?rev=d550e01#d550e01d3aeb7b334ed44e87652706acb5b3aea8" dependencies = [ "lazy_static", "libc", diff --git a/Cargo.toml b/Cargo.toml index 689c52c0f..7a069fdac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,9 +64,9 @@ quote = "1.0.21" rand = "0.8.5" rand_chacha = "0.3.1" rand_xoshiro = "0.6.0" -rustcommon-logger = { git = "https://github.com/twitter/rustcommon", rev = "87e0c87" } -rustcommon-metrics = { git = "https://github.com/twitter/rustcommon", rev = "87e0c87" } -rustcommon-time = { git = "https://github.com/twitter/rustcommon", rev = "87e0c87" } +rustcommon-logger = { git = "https://github.com/twitter/rustcommon", rev = "d550e01" } +rustcommon-metrics = { git = "https://github.com/twitter/rustcommon", rev = "d550e01" } +rustcommon-time = { git = "https://github.com/twitter/rustcommon", rev = "d550e01" } serde = "1.0.145" serde_json = "1.0.85" slab = "0.4.7" diff --git a/src/core/proxy/src/lib.rs b/src/core/proxy/src/lib.rs index e585b51b1..367b01593 100644 --- a/src/core/proxy/src/lib.rs +++ b/src/core/proxy/src/lib.rs @@ -32,7 +32,7 @@ use std::io::{Error, ErrorKind, Result}; use std::sync::Arc; use waker::Waker; -type Instant = rustcommon_metrics::Instant>; +type Instant = rustcommon_metrics::time::Instant>; mod backend; mod frontend; diff --git a/src/core/server/src/lib.rs b/src/core/server/src/lib.rs index a2135af83..56067de6f 100644 --- a/src/core/server/src/lib.rs +++ b/src/core/server/src/lib.rs @@ -120,7 +120,7 @@ use workers::WorkersBuilder; pub use process::{Process, ProcessBuilder}; -type Instant = rustcommon_metrics::Instant>; +type Instant = rustcommon_metrics::time::Instant>; // TODO(bmartin): this *should* be plenty safe, the queue should rarely ever be // full, and a single wakeup should drain at least one message and make room for diff --git a/src/protocol/memcache/src/lib.rs b/src/protocol/memcache/src/lib.rs index 0f42eec93..c060ddac2 100644 --- a/src/protocol/memcache/src/lib.rs +++ b/src/protocol/memcache/src/lib.rs @@ -20,6 +20,7 @@ pub use protocol_common::*; use common::expiry::TimeType; use logger::Klog; +use rustcommon_metrics::time::*; use rustcommon_metrics::*; const CRLF: &[u8] = b"\r\n";