Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,206 changes: 576 additions & 630 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ resolver = "2"
license = "AGPL-3.0-or-later"

[workspace.dependencies]
thiserror = "1.0"
thiserror = "2"
chrono = { version = "0.4", default-features = false, features = ["std", "serde"] }
serde = { version = "1", features = ["derive"] }
uuid = { version = ">=0.7.0, <2.0.0", features = ["v4", "serde"] }
uuid = { version = "1.22", features = ["v4", "serde"] }
async-trait = "0.1.80"
metrics = "0.22"
metrics = "0.24"

hdrop-db = { path = "hdrop-db" }
hdrop-shared = {path = "hdrop-shared"}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# hdrop
![Backed by Zitane Labs][badge_zitane]
![Powered by Rust][badge_rust]
![MSRV][badge_msrv]
![License: AGPL 3.0][badge_license]
![Github CI][github_ci]

[badge_zitane]: https://badgers.space/badge/Backed%20by/Zitane%20Labs/pink
[badge_rust]: https://badgers.space/badge/Powered%20by/Rust/orange
[badge_msrv]: https://badgers.space/badge/MSRV/1.88.0/green
[badge_license]: https://badgers.space/github/license/ZitaneLabs/hdrop
[github_ci]: https://badgers.space/github/checks/zitanelabs/hdrop

Expand Down
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ allow = [
"MPL-2.0", # dependencies of zitane-s3-async
"OpenSSL", # used by aws-lc-sys, dependency of metrics-exporter-prometheus through hdrop-server
"CC0-1.0",
"Zlib", # OSI approved, FSF free/libre, used by foldhash
]

[bans]
Expand Down
6 changes: 3 additions & 3 deletions hdrop-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ edition = "2021"
license.workspace = true

[dependencies]
diesel = { version = "2.1", features = ["postgres", "chrono", "uuid"] }
diesel = { version = "2.3", features = ["postgres", "chrono", "uuid"] }
sha3 = "0.10.8"
deadpool-diesel = { version = "0.6", features = ["postgres"] }
deadpool = { version = "0.12", features = ["rt_tokio_1"] }
deadpool-diesel = { version = "0.6.1", features = ["postgres"] }
deadpool = { version = "0.12.3", features = ["rt_tokio_1"] }

chrono.workspace = true
uuid.workspace = true
Expand Down
14 changes: 7 additions & 7 deletions hdrop-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
axum = { version = "0.7", features = ["multipart", "macros"] }
axum-extra = { version = "0.9.3", features = ["typed-header", "tracing"] }
axum = { version = "0.8", features = ["multipart", "macros"] }
axum-extra = { version = "0.12", features = ["typed-header", "tracing"] }
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
dotenvy = "0.15"
regex = "1.10"
tower-http = { version = "0.5", features = [
regex = "1.12.3"
tower-http = { version = "0.6", features = [
"cors",
"limit",
"compression-br",
Expand All @@ -23,9 +23,9 @@ bincache = { git = "https://github.com/ZitaneLabs/bincache.git", features = [
"comp_zstd",
] }
s3 = { version = "0.37", package = "zitane-s3-async" }
metrics-exporter-prometheus = "0.15"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tracing = "0.1.40"
metrics-exporter-prometheus = "0.18"
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
tracing = "0.1.44"
sysinfo = "0.30"

chrono.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions hdrop-server/src/server/prometheus_metrics_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ impl PrometheusMetricsServer {
/// Register all gauges from names module.
fn register_metrics(&self) {
for name in names::GAUGE_NAMES {
metrics::gauge!(name);
_ = metrics::gauge!(name);
}
for name in names::HISTOGRAM_NAMES {
metrics::histogram!(name);
_ = metrics::histogram!(name);
}
for name in names::COUNTER_NAMES {
metrics::counter!(name);
_ = metrics::counter!(name);
}
}

Expand Down
1 change: 0 additions & 1 deletion hdrop-shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ edition = "2021"
license.workspace = true

[dependencies]
once_cell = "1.19"
paste = "1.0"

serde.workspace = true
Expand Down
7 changes: 3 additions & 4 deletions hdrop-shared/src/env.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::path::PathBuf;
use std::{path::PathBuf, sync::OnceLock};

use once_cell::sync::OnceCell;
use paste::paste;

#[derive(Debug, Clone, thiserror::Error)]
Expand All @@ -14,7 +13,7 @@ pub enum EnvError {
macro_rules! env_get {
($name:ident) => {
paste! {
static [<$name:upper _CELL>]: OnceCell<Result<String, EnvError>> = OnceCell::new();
static [<$name:upper _CELL>]: OnceLock<Result<String, EnvError>> = OnceLock::new();

#[doc ="Get the value of the '" $name:upper "' environment variable."]
pub fn [<$name>]() -> Result<String, EnvError> {
Expand All @@ -28,7 +27,7 @@ macro_rules! env_get {

($name:ident => $target_type:ty) => {
paste! {
static [<$name:upper _CELL>]: OnceCell<Result<$target_type, EnvError>> = OnceCell::new();
static [<$name:upper _CELL>]: OnceLock<Result<$target_type, EnvError>> = OnceLock::new();

#[doc ="Get the value of the '" $name:upper "' environment variable."]
pub fn [<$name>]() -> Result<$target_type, EnvError> {
Expand Down
Loading