Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/observability

# Conflicts:
#	Cargo.lock
#	Cargo.toml
This commit is contained in:
houseme
2025-03-31 15:12:30 +08:00
55 changed files with 3970 additions and 119 deletions
+9 -1
View File
@@ -12,6 +12,8 @@ members = [
"crypto", # Cryptography and security features
"cli/rustfs-gui", # Graphical user interface client
"packages/obs", # Observability utilities
"s3select/api",
"s3select/query",
]
resolver = "2"
@@ -30,6 +32,7 @@ all = "warn"
[workspace.dependencies]
madmin = { path = "./madmin" }
async-recursion = "1.0.5"
async-trait = "0.1.87"
backon = "1.3.0"
bytes = "1.9.0"
@@ -37,6 +40,8 @@ bytesize = "1.3.0"
chrono = { version = "0.4.40", features = ["serde"] }
clap = { version = "4.5.31", features = ["derive", "env"] }
config = "0.15.9"
datafusion = "46.0.0"
derive_builder = "0.20.2"
dioxus = { version = "0.6.3", features = ["router"] }
dirs = "6.0.0"
ecstore = { path = "./ecstore" }
@@ -44,7 +49,7 @@ flatbuffers = "24.12.23"
futures = "0.3.31"
futures-util = "0.3.31"
common = { path = "./common/common" }
policy = {path = "./policy"}
policy = { path = "./policy" }
hex = "0.4.3"
hyper = "1.6.0"
hyper-util = { version = "0.1.10", features = [
@@ -107,6 +112,7 @@ tonic = { version = "0.12.3", features = ["gzip"] }
tonic-build = "0.12.3"
tonic-reflection = "0.12"
tokio-stream = "0.1.17"
tokio-util = { version = "0.7.13", features = ["io", "compat"] }
tower = { version = "0.5.2", features = ["timeout"] }
tracing = "0.1.41"
tracing-core = "0.1.33"
@@ -126,6 +132,8 @@ axum = "0.7.9"
md-5 = "0.10.6"
workers = { path = "./common/workers" }
test-case = "3.3.1"
zip = "2.2.3"
snafu = "0.8.5"
[profile.wasm-dev]
inherits = "dev"