diff --git a/Cargo.lock b/Cargo.lock index 44e2a4a2..9ba108cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -419,9 +419,9 @@ dependencies = [ "boring", "clocksource", "macros", - "metriken 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "metriken 0.2.4", "net", - "ringlog", + "ringlog 0.2.0", "serde", ] @@ -834,7 +834,8 @@ dependencies = [ [[package]] name = "histogram" version = "0.8.0" -source = "git+https://github.com/brayniac/rustcommon?branch=metriken-histograms#e283f6e7943ca6c85752265210bf8e239e0c54a2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bbe54c811e0443ccedc269b633a9495a03e04c20082b26f6c1cc4d27bfd0678" dependencies = [ "thiserror", ] @@ -1138,7 +1139,7 @@ source = "git+https://github.com/pelikan-io/pelikan#294b67991cd14c8362bd7aa9b688 dependencies = [ "common", "config", - "ringlog", + "ringlog 0.2.0", ] [[package]] @@ -1180,7 +1181,7 @@ checksum = "daa97a9e24ba40ec25d997efe33ce88c5d27eace316539a58a0271806e1dce36" dependencies = [ "heatmap", "linkme", - "metriken-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "metriken-derive", "once_cell", "parking_lot", "phf", @@ -1188,12 +1189,13 @@ dependencies = [ [[package]] name = "metriken" -version = "0.2.4" -source = "git+https://github.com/brayniac/rustcommon?branch=metriken-histograms#e283f6e7943ca6c85752265210bf8e239e0c54a2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cdbc5c288bcf449bdf639e712c24305ec3bcd5765b80f6f1bbd38038ba89ac" dependencies = [ "histogram 0.8.0", "linkme", - "metriken-derive 0.2.0 (git+https://github.com/brayniac/rustcommon?branch=metriken-histograms)", + "metriken-derive", "once_cell", "parking_lot", "phf", @@ -1211,17 +1213,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "metriken-derive" -version = "0.2.0" -source = "git+https://github.com/brayniac/rustcommon?branch=metriken-histograms#e283f6e7943ca6c85752265210bf8e239e0c54a2" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "mime" version = "0.3.17" @@ -1378,7 +1369,7 @@ dependencies = [ "boring-sys", "foreign-types-shared", "libc", - "metriken 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "metriken 0.2.4", "mio 0.8.8", ] @@ -1716,7 +1707,7 @@ source = "git+https://github.com/pelikan-io/pelikan#294b67991cd14c8362bd7aa9b688 dependencies = [ "common", "logger", - "metriken 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "metriken 0.2.4", "nom", "protocol-common", ] @@ -1729,7 +1720,7 @@ dependencies = [ "common", "config", "logger", - "metriken 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "metriken 0.2.4", "protocol-common", "storage-types", ] @@ -1899,7 +1890,20 @@ dependencies = [ "ahash", "clocksource", "log", - "metriken 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "metriken 0.2.4", + "mpmc", +] + +[[package]] +name = "ringlog" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "987665e9638b6e3c9bf753fd2da5058c8fa0e734221582d8790e3b7d0e1c3394" +dependencies = [ + "ahash", + "clocksource", + "log", + "metriken 0.3.0", "mpmc", ] @@ -1921,7 +1925,7 @@ dependencies = [ "http-body-util", "humantime", "hyper 1.0.0-rc.4", - "metriken 0.2.4 (git+https://github.com/brayniac/rustcommon?branch=metriken-histograms)", + "metriken 0.3.0", "mio 0.8.8", "momento", "net", @@ -1934,7 +1938,7 @@ dependencies = [ "rand_xoshiro", "ratelimit", "redis", - "ringlog", + "ringlog 0.3.0", "rpcperf-dataspec", "serde", "serde_json", @@ -2141,7 +2145,7 @@ dependencies = [ "bytes 1.5.0", "common", "log", - "metriken 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "metriken 0.2.4", "net", "protocol-common", ] diff --git a/Cargo.toml b/Cargo.toml index 723b50a9..6164d2b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ repository = { workspace = true } license = { workspace = true } [workspace.dependencies] -histogram = { git = "https://github.com/brayniac/rustcommon", branch = "metriken-histograms" } +histogram = { version = "0.8.0" } serde = { version = "1.0.185", features = ["derive"] } [dependencies] @@ -35,7 +35,7 @@ hyper = { version = "1.0.0-rc.4", features = ["http1", "http2", "client"]} histogram = { workspace = true } humantime = "2.1.0" momento = "0.31.0" -metriken = { git = "https://github.com/brayniac/rustcommon", branch = "metriken-histograms" } +metriken = { version = "0.3.0" } mio = "0.8.8" net = { git = "https://github.com/pelikan-io/pelikan" } once_cell = "1.18.0" @@ -47,7 +47,7 @@ rand_distr = "0.4.3" rand_xoshiro = "0.6.0" ratelimit = "0.7.0" redis = { version = "0.22.3", features = ["tokio-comp"] } -ringlog = "0.2.0" +ringlog = "0.3.0" rpcperf-dataspec = { path = "lib/dataspec" } serde = { workspace = true } serde_json = "1.0.105"