Skip to content

Commit

Permalink
Upgrade crates to latest versions (#1196)
Browse files Browse the repository at this point in the history 
Upgrade all dependencies to the latest versions. Fix minor breaking
change in the API for `sysinfo`.

### Does this change impact existing behavior?

No.

### Does this change need a changelog entry?

No.

---

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license and I agree to the terms of
the [Developer Certificate of Origin
(DCO)](https://developercertificate.org/).

Signed-off-by: Alessandro Passaro <[email protected]>
  • Loading branch information
@passaro
passaro authored Dec 10, 2024
1 parent caaa11b commit 9d1196d
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 71 deletions.
46 changes: 33 additions & 13 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions mountpoint-s3-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,43 +14,43 @@ mountpoint-s3-crt-sys = { path = "../mountpoint-s3-crt-sys", version = "0.10.0"
async-trait = "0.1.83"
auto_impl = "1.2.0"
base64ct = { version = "1.6.0", features = ["std"] }
const_format = "0.2.33"
const_format = "0.2.34"
futures = "0.3.31"
lazy_static = "1.5.0"
metrics = "0.24.0"
metrics = "0.24.1"
once_cell = "1.20.2"
percent-encoding = "2.3.1"
pin-project = "1.1.6"
pin-project = "1.1.7"
platform-info = "2.0.4"
regex = "1.11.0"
serde_json = "1.0.132"
regex = "1.11.1"
serde_json = "1.0.133"
static_assertions = "1.1.0"
thiserror = "1.0.65"
time = { version = "0.3.36", features = ["formatting", "parsing"] }
tracing = { version = "0.1.40", default-features = false, features = ["std", "log"] }
thiserror = "2.0.6"
time = { version = "0.3.37", features = ["formatting", "parsing"] }
tracing = { version = "0.1.41", default-features = false, features = ["std", "log"] }
xmltree = "0.11.0"

# Dependencies for the mock client only
async-io = { version = "2.3.4", optional = true }
async-io = { version = "2.4.0", optional = true }
async-lock = { version = "3.4.0", optional = true }
md-5 = { version = "0.10.6", optional = true }
rand = { version = "0.8.5", optional = true }
rand_chacha = { version = "0.3.1", optional = true }

[dev-dependencies]
aws-config = "1.5.8"
aws-config = "1.5.10"
aws-credential-types = "1.2.1"
aws-sdk-s3 = "1.57.0"
aws-smithy-runtime-api = "1.7.2"
bytes = "1.8.0"
clap = { version = "4.5.20", features = ["derive"] }
ctor = "0.2.8"
aws-sdk-s3 = "1.65.0"
aws-smithy-runtime-api = "1.7.3"
bytes = "1.9.0"
clap = { version = "4.5.23", features = ["derive"] }
ctor = "0.2.9"
proptest = "1.5.0"
rusty-fork = "0.3.0"
tempfile = "3.13.0"
tempfile = "3.14.0"
test-case = "3.3.1"
tokio = { version = "1.41.0", features = ["rt", "macros"] }
tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
tokio = { version = "1.42.0", features = ["rt", "macros"] }
tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"] }

# HACK: we want our own tests to use the mock client, but don't want to enable it for consumers by
# default, so we take a dev-dependency on ourself with that feature enabled.
Expand Down
10 changes: 5 additions & 5 deletions mountpoint-s3-crt-sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ exclude = [
]

[build-dependencies]
bindgen = { version = "0.70.1", default-features = false, features = [
bindgen = { version = "0.71.1", default-features = false, features = [
"runtime",
] }
cc = "1.1.31"
cmake = "0.1.51"
cc = "1.2.3"
cmake = "0.1.52"
rustflags = "0.1.6"
which = "6.0.3"
which = "7.0.0"

[dependencies]
libc = "0.2.161"
libc = "0.2.168"

[lib]
doctest = false
16 changes: 8 additions & 8 deletions mountpoint-s3-crt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ description = "Rust interface to the AWS Common Runtime for Mountpoint for Amazo
mountpoint-s3-crt-sys = { path = "../mountpoint-s3-crt-sys", version = "0.10.0" }

futures = "0.3.31"
libc = "0.2.161"
libc = "0.2.168"
log = "0.4.22"
smallstr = "0.3.0"
static_assertions = "1.1.0"
thiserror = "1.0.65"
thiserror = "2.0.6"

[dev-dependencies]
anyhow = { version = "1.0.91", features = ["backtrace"] }
clap = { version = "4.5.20", features = ["derive"] }
anyhow = { version = "1.0.94", features = ["backtrace"] }
clap = { version = "4.5.23", features = ["derive"] }
criterion = "0.5.1"
ctor = "0.2.8"
ctor = "0.2.9"
rand = { version = "0.8.5", features = ["small_rng"] }
serde_json = "1.0.132"
serde_json = "1.0.133"
test-case = "3.3.1"
tracing = { version = "0.1.40", default-features = false, features = ["std", "log"] }
tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
tracing = { version = "0.1.41", default-features = false, features = ["std", "log"] }
tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"] }

[[bench]]
name = "event_loop_future"
Expand Down
50 changes: 25 additions & 25 deletions mountpoint-s3/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,42 @@ fuser = { path = "../vendor/fuser", version = "0.15.0", features = ["abi-7-28"]
mountpoint-s3-client = { path = "../mountpoint-s3-client", version = "0.11.0" }
mountpoint-s3-crt = { path = "../mountpoint-s3-crt", version = "0.10.0" }

anyhow = { version = "1.0.91", features = ["backtrace"] }
anyhow = { version = "1.0.94", features = ["backtrace"] }
async-channel = "2.3.1"
async-lock = "3.4.0"
async-stream = "0.3.6"
async-trait = "0.1.83"
base64ct = "1.6.0"
bincode = "1.3.3"
bitflags = "2.6.0"
bytes = { version = "1.8.0", features = ["serde"] }
clap = { version = "4.5.20", features = ["derive"] }
const_format = "0.2.33"
bytes = { version = "1.9.0", features = ["serde"] }
clap = { version = "4.5.23", features = ["derive"] }
const_format = "0.2.34"
crc32c = "0.6.8"
ctrlc = { version = "3.4.5", features = ["termination"] }
dashmap = "6.1.0"
futures = "0.3.31"
hdrhistogram = { version = "7.5.4", default-features = false }
hex = "0.4.3"
libc = "0.2.161"
humansize = "2.1.3"
libc = "0.2.168"
linked-hash-map = "0.5.6"
metrics = "0.24.0"
metrics = "0.24.1"
nix = { version = "0.29.0", default-features = false, features = ["fs", "process", "signal", "user"] }
owo-colors = { version = "4.1.0", features = ["supports-colors"] }
rand = "0.8.5"
regex = "1.11.0"
serde = { version = "1.0.213", features = ["derive"] }
serde_json = "1.0.132"
regex = "1.11.1"
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
sha2 = "0.10.8"
supports-color = "3.0.1"
sysinfo = "0.32.0"
supports-color = "3.0.2"
sysinfo = "0.33.0"
syslog = "7.0.0"
thiserror = "1.0.65"
time = { version = "0.3.36", features = ["macros", "formatting"] }
tracing = { version = "0.1.40", features = ["log"] }
thiserror = "2.0.6"
time = { version = "0.3.37", features = ["macros", "formatting"] }
tracing = { version = "0.1.41", features = ["log"] }
tracing-log = "0.2.0"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
async-stream = "0.3.6"
humansize = "2.1.3"
base64ct = "1.6.0"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }

[target.'cfg(target_os = "linux")'.dependencies]
procfs = { version = "0.17.0", default-features = false }
Expand All @@ -56,25 +56,25 @@ mountpoint-s3-client = { path = "../mountpoint-s3-client", features = ["mock"] }

assert_cmd = "2.0.16"
assert_fs = "1.1.2"
aws-config = "1.5.8"
aws-config = "1.5.10"
aws-credential-types = "1.2.1"
aws-sdk-s3 = "1.57.0"
ctor = "0.2.8"
aws-sdk-s3 = "1.65.0"
ctor = "0.2.9"
filetime = "0.2.25"
futures = { version = "*", features = ["thread-pool"] }
httpmock = "0.7.0"
predicates = "3.1.2"
proptest = "1.5.0"
proptest-derive = "0.5.0"
rand = "0.8.5"
rand_chacha = "0.3.1"
serial_test = "3.1.1"
serial_test = "3.2.0"
sha2 = "0.10.8"
shuttle = { version = "0.8.0" }
tempfile = "3.13.0"
tempfile = "3.14.0"
test-case = "3.3.1"
tokio = { version = "1.41.0", features = ["rt", "macros"] }
tokio = { version = "1.42.0", features = ["rt", "macros"] }
walkdir = "2.5.0"
httpmock = "0.7.0"

[build-dependencies]
built = { version = "0.7.5", features = ["git2"] }
Expand Down
4 changes: 2 additions & 2 deletions mountpoint-s3/src/metrics.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ pub fn install() -> MetricsSinkHandle {
fn poll_process_metrics(sys: &mut System) {
if let Ok(pid) = get_current_pid() {
let last_mem = sys.process(pid).map_or(0, |process| process.memory());
sys.refresh_memory_specifics(MemoryRefreshKind::new().with_ram());
sys.refresh_memory_specifics(MemoryRefreshKind::nothing().with_ram());
sys.refresh_processes_specifics(
ProcessesToUpdate::Some(&[pid]),
false,
ProcessRefreshKind::new().with_memory(),
ProcessRefreshKind::nothing().with_memory(),
);
if let Some(process) = sys.process(pid) {
// update the metrics only when there is some change, otherwise it will be too spammy.
Expand Down

0 comments on commit 9d1196d

Please sign in to comment.