Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rust deps #1536

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Bump rust deps #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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,010 changes: 696 additions & 314 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,29 @@ nativelink-worker = { path = "nativelink-worker" }
nativelink-metric = { path = "nativelink-metric" }
nativelink-metric-collector = { path = "nativelink-metric-collector" }
async-lock = { version = "3.4.0", features = ["std"], default-features = false }
axum = { version = "0.7.7", default-features = false }
clap = { version = "4.5.18", features = ["derive"] }
futures = { version = "0.3.30", default-features = false }
hyper = "1.4.1"
hyper-util = "0.1.9"
axum = { version = "0.7.9", default-features = false }
clap = { version = "4.5.23", features = ["derive"] }
futures = { version = "0.3.31", default-features = false }
hyper = "1.5.1"
hyper-util = "0.1.10"
mimalloc = "0.1.43"
parking_lot = "0.12.3"
rustls-pemfile = { version = "2.2.0", default-features = false }
scopeguard = { version = "1.2.0", default-features = false }
serde_json5 = "0.1.0"
tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-rustls = { version = "0.26.0", default-features = false, features = [
tokio = { version = "1.42.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-rustls = { version = "0.26.1", default-features = false, features = [
"ring",
] }
tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false }
tower = { version = "0.5.1", default-features = false }
tracing = { version = "0.1.40", default-features = false }
opentelemetry_sdk = { version = "0.24.1", default-features = false }
tracing-subscriber = { version = "0.3.18", default-features = false }
opentelemetry = { version = "0.24.0", default-features = false }
tower = { version = "0.5.2", default-features = false }
tracing = { version = "0.1.41", default-features = false }
opentelemetry_sdk = { version = "0.27.1", default-features = false }
tracing-subscriber = { version = "0.3.19", default-features = false }
opentelemetry = { version = "0.27.1", default-features = false }
prometheus = { version = "0.13.4", default-features = false }
opentelemetry-prometheus = "0.17.0"
serde_json = "1.0.128"
opentelemetry-prometheus = "0.27.0"
serde_json = "1.0.133"

[workspace.cargo-features-manager.keep]
async-lock = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions nativelink-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.5.3"
edition = "2021"

[dependencies]
byte-unit = { version = "5.1.4", default-features = false, features = ["byte"] }
byte-unit = { version = "5.1.6", default-features = false, features = ["byte"] }
humantime = "2.1.0"
serde = { version = "1.0.210", default-features = false, features = ["derive"] }
serde = { version = "1.0.216", default-features = false, features = ["derive"] }
serde_json5 = "0.1.0"
shellexpand = { version = "3.1.0", default-features = false, features = ["base-0"] }

Expand Down
10 changes: 5 additions & 5 deletions nativelink-error/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ autobenches = false
[dependencies]
nativelink-proto = { path = "../nativelink-proto" }
nativelink-metric = { path = "../nativelink-metric" }
fred = { version = "9.2.1", default-features = false, features = [
fred = { version = "10.0.1", default-features = false, features = [
"enable-rustls-ring",
] }
hex = { version = "0.4.3", default-features = false }
prost = { version = "0.13.3", default-features = false }
prost-types = { version = "0.13.3", default-features = false }
serde = { version = "1.0.210", default-features = false }
tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
prost = { version = "0.13.4", default-features = false }
prost-types = { version = "0.13.4", default-features = false }
serde = { version = "1.0.216", default-features = false }
tokio = { version = "1.42.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false }
10 changes: 5 additions & 5 deletions nativelink-error/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,17 @@ impl From<Code> for Error {
}
}

impl From<fred::error::RedisError> for Error {
fn from(error: fred::error::RedisError) -> Self {
use fred::error::RedisErrorKind::{
impl From<fred::error::Error> for Error {
fn from(error: fred::error::Error) -> Self {
use fred::error::ErrorKind::{
Auth, Backpressure, Canceled, Cluster, Config, InvalidArgument, InvalidCommand,
NotFound, Parse, Protocol, Sentinel, Timeout, Tls, Unknown, Url, IO,
NotFound, Parse, Protocol, Routing, Sentinel, Timeout, Tls, Unknown, Url, IO,
};

// Conversions here are based on https://grpc.github.io/grpc/core/md_doc_statuscodes.html.
let code = match error.kind() {
Config | InvalidCommand | InvalidArgument | Url => Code::InvalidArgument,
IO | Protocol | Tls | Cluster | Parse | Sentinel => Code::Internal,
IO | Protocol | Tls | Cluster | Parse | Sentinel | Routing => Code::Internal,
Auth => Code::PermissionDenied,
Canceled => Code::Aborted,
Unknown => Code::Unknown,
Expand Down
4 changes: 2 additions & 2 deletions nativelink-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"
proc-macro = true

[dependencies]
proc-macro2 = { version = "1.0.86", default-features = false }
proc-macro2 = { version = "1.0.92", default-features = false }
quote = { version = "1.0.37", default-features = false }
syn = { version = "2.0.79", default-features = false }
syn = { version = "2.0.90", default-features = false }
14 changes: 7 additions & 7 deletions nativelink-metric-collector/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ rust-version = "1.79.0"

[dependencies]
nativelink-metric = { path = "../nativelink-metric" }
opentelemetry = { version = "0.24.0", features = ["metrics"], default-features = false }
opentelemetry = { version = "0.27.1", features = ["metrics"], default-features = false }
parking_lot = "0.12.3"
serde = { version = "1.0.210", default-features = false }
tracing = { version = "0.1.40", default-features = false }
tracing-subscriber = { version = "0.3.18", default-features = false }
serde = { version = "1.0.216", default-features = false }
tracing = { version = "0.1.41", default-features = false }
tracing-subscriber = { version = "0.3.19", default-features = false }

[dev-dependencies]
nativelink-error = { path = "../nativelink-error" }
opentelemetry_sdk = { version = "0.24.1", default-features = false }
opentelemetry-prometheus = "0.17.0"
opentelemetry_sdk = { version = "0.27.1", default-features = false }
opentelemetry-prometheus = "0.27.0"
prometheus = { version = "0.13.4", default-features = false }
serde_json = { version = "1.0.128", default-features = false }
serde_json = { version = "1.0.133", default-features = false }
2 changes: 1 addition & 1 deletion nativelink-metric-collector/src/otel_exporter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ fn process_primitive(prefix: &mut String, meter: &Meter, primitive: &CollectedMe
let counter = meter
.u64_counter(prefix.clone())
.with_description(primitive.help.clone())
.init();
.build();
counter.add(*value, &[]);
}
Some(CollectedMetricPrimitiveValue::String(_value)) => {
Expand Down
2 changes: 1 addition & 1 deletion nativelink-metric-collector/tests/metric_collector_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ fn test_prometheus_exporter() {
nativelink_custom_handler_num_counter 6
nativelink_foo_custom_handler_num_counter 4
nativelink_pub_u64 1
target_info{service_name="unknown_service",telemetry_sdk_language="rust",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="0.24.1"} 1
target_info{service_name="unknown_service",telemetry_sdk_language="rust",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="0.27.1"} 1
"#.trim()).lines().map(|v| v.unwrap()).collect();

// We need to sort because the output order is non-deterministic.
Expand Down
4 changes: 2 additions & 2 deletions nativelink-metric/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
nativelink-metric-macro-derive = { path = "nativelink-metric-macro-derive" }
async-lock = { version = "3.4.0", features = ["std"], default-features = false }
parking_lot = "0.12.3"
tracing = { version = "0.1.40", default-features = false }
tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tracing = { version = "0.1.41", default-features = false }
tokio = { version = "1.42.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
4 changes: 2 additions & 2 deletions nativelink-metric/nativelink-metric-macro-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"
proc-macro = true

[dependencies]
proc-macro2 = { version = "1.0.86", default-features = false }
proc-macro2 = { version = "1.0.92", default-features = false }
quote = { version = "1.0.37", default-features = false }
syn = { version = "2.0.79", default-features = false }
syn = { version = "2.0.90", default-features = false }
6 changes: 3 additions & 3 deletions nativelink-proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ path = "genproto/lib.rs"
doctest = false

[dependencies]
prost = { version = "0.13.3", default-features = false }
prost-types = { version = "0.13.3", default-features = false }
prost = { version = "0.13.4", default-features = false }
prost-types = { version = "0.13.4", default-features = false }
tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false }

[dev-dependencies]
prost-build = { version = "0.13.3", default-features = false }
prost-build = { version = "0.13.4", default-features = false }
tonic-build = { version = "0.12.3", features = ["prost"], default-features = false }
22 changes: 11 additions & 11 deletions nativelink-scheduler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@ nativelink-metric = { path = "../nativelink-metric" }
nativelink-store = { path = "../nativelink-store" }
async-lock = { version = "3.4.0", features = ["std"], default-features = false }
async-trait = "0.1.83"
bytes = { version = "1.7.2", default-features = false }
prost = { version = "0.13.3", default-features = false }
uuid = { version = "1.10.0", default-features = false, features = ["v4", "serde"] }
futures = { version = "0.3.30", default-features = false }
lru = { version = "0.12.4", default-features = false }
bytes = { version = "1.9.0", default-features = false }
prost = { version = "0.13.4", default-features = false }
uuid = { version = "1.11.0", default-features = false, features = ["v4", "serde"] }
futures = { version = "0.3.31", default-features = false }
lru = { version = "0.12.5", default-features = false }
mock_instant = "0.5.1"
parking_lot = "0.12.3"
rand = { version = "0.8.5", default-features = false }
scopeguard = { version = "1.2.0", default-features = false }
tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-stream = { version = "0.1.16", features = ["fs"], default-features = false }
tokio = { version = "1.42.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-stream = { version = "0.1.17", features = ["fs"], default-features = false }
tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false }
tracing = { version = "0.1.40", default-features = false }
serde = { version = "1.0.210", features = ["rc"] }
serde_json = "1.0.128"
tracing = { version = "0.1.41", default-features = false }
serde = { version = "1.0.216", features = ["rc"] }
serde_json = "1.0.133"
static_assertions = "1.1.0"

[dev-dependencies]
nativelink-macro = { path = "../nativelink-macro" }
pretty_assertions = { version = "1.4.1", features = ["std"] }
fred = { version = "9.2.1", default-features = false, features = [
fred = { version = "10.0.1", default-features = false, features = [
"mocks",
] }
9 changes: 5 additions & 4 deletions nativelink-scheduler/tests/redis_store_awaited_action_db_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 The NativeLink Authors. All rights reserved.
// Copyright 2024 The NativeLink Authorsr All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -21,10 +21,11 @@ use std::time::{Duration, SystemTime};
use bytes::Bytes;
use fred::bytes_utils::string::Str;
use fred::clients::SubscriberClient;
use fred::error::{RedisError, RedisErrorKind};
use fred::error::{Error as RedisError, ErrorKind as RedisErrorKind};
use fred::mocks::{MockCommand, Mocks};
use fred::prelude::{Builder, RedisPool};
use fred::types::{PerformanceConfig, RedisConfig, RedisValue};
use fred::prelude::{Builder, Pool as RedisPool};
use fred::types::config::{Config as RedisConfig, PerformanceConfig};
use fred::types::Value as RedisValue;
use mock_instant::global::SystemTime as MockSystemTime;
use nativelink_error::Error;
use nativelink_macro::nativelink_test;
Expand Down
26 changes: 13 additions & 13 deletions nativelink-service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ nativelink-config = { path = "../nativelink-config" }
nativelink-util = { path = "../nativelink-util" }
nativelink-store = { path = "../nativelink-store" }
nativelink-scheduler = { path = "../nativelink-scheduler" }
axum = { version = "0.7.7", default-features = false }
bytes = { version = "1.7.2", default-features = false }
futures = { version = "0.3.30", default-features = false }
axum = { version = "0.7.9", default-features = false }
bytes = { version = "1.9.0", default-features = false }
futures = { version = "0.3.31", default-features = false }
http-body = "1.0.1"
http-body-util = "0.1.2"
hyper = { version = "1.4.1" }
hyper = { version = "1.5.1" }
serde_json5 = "0.1.0"
parking_lot = "0.12.3"
prost = { version = "0.13.3", default-features = false }
tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-stream = { version = "0.1.16", features = ["fs"], default-features = false }
prost = { version = "0.13.4", default-features = false }
tokio = { version = "1.42.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-stream = { version = "0.1.17", features = ["fs"], default-features = false }
tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false }
tower = { version = "0.5.1", default-features = false }
tracing = { version = "0.1.40", default-features = false }
uuid = { version = "1.10.0", default-features = false, features = ["v4", "serde"] }
tower = { version = "0.5.2", default-features = false }
tracing = { version = "0.1.41", default-features = false }
uuid = { version = "1.11.0", default-features = false, features = ["v4", "serde"] }

[dev-dependencies]
nativelink-macro = { path = "../nativelink-macro" }
nativelink-metric = { path = "../nativelink-metric" }

async-trait = "0.1.83"
async-lock = { version = "3.4.0", features = ["std"], default-features = false }
hyper = "1.4.1"
hyper-util = "0.1.9"
hyper = "1.5.1"
hyper-util = "0.1.10"
maplit = "1.0.2"
pretty_assertions = { version = "1.4.1", features = ["std"] }
prost-types = { version = "0.13.3", default-features = false }
prost-types = { version = "0.13.4", default-features = false }
48 changes: 24 additions & 24 deletions nativelink-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ nativelink-proto = { path = "../nativelink-proto" }
nativelink-metric = { path = "../nativelink-metric" }
async-lock = { version = "3.4.0", features = ["std"], default-features = false }
async-trait = "0.1.83"
aws-config = { version = "=1.5.4", default-features = false, features = [
aws-config = { version = "1.5.10", default-features = false, features = [
"rustls",
] }
aws-sdk-s3 = { version = "=1.42.0", features = [
aws-sdk-s3 = { version = "1.65.0", features = [
"rt-tokio",
], default-features = false }
aws-smithy-runtime = { version = "=1.6.2" }
aws-smithy-runtime = { version = "1.7.4" }
bincode = "1.3.3"
blake3 = { version = "1.5.4", default-features = false }
blake3 = { version = "1.5.5", default-features = false }
byteorder = { version = "1.5.0", default-features = false }
bytes = { version = "1.7.2", default-features = false }
bytes = { version = "1.9.0", default-features = false }
bytes-utils = { version = "0.1.4", default-features = false }
const_format = { version = "0.2.33", default-features = false }
const_format = { version = "0.2.34", default-features = false }
filetime = "0.2.25"
fred = { version = "9.2.1", default-features = false, features = [
fred = { version = "10.0.1", default-features = false, features = [
"i-std",
"i-scripts",
"i-redisearch",
Expand All @@ -39,7 +39,7 @@ fred = { version = "9.2.1", default-features = false, features = [
"subscriber-client",
] }
patricia_tree = { version = "0.8.0", default-features = false }
futures = { version = "0.3.30", default-features = false }
futures = { version = "0.3.31", default-features = false }
hex = { version = "0.4.3", default-features = false }
http-body = "1.0.1"
hyper = { version = "0.14.31" }
Expand All @@ -48,15 +48,15 @@ hyper-rustls = { version = "0.24.2", default-features = false, features = [
] }
lz4_flex = { version = "0.11.3", default-features = false }
parking_lot = "0.12.3"
prost = { version = "0.13.3", default-features = false }
prost = { version = "0.13.4", default-features = false }
rand = { version = "0.8.5", default-features = false }
serde = { version = "1.0.210", default-features = false }
tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-stream = { version = "0.1.16", features = ["fs"], default-features = false }
tokio-util = { version = "0.7.12" }
serde = { version = "1.0.216", default-features = false }
tokio = { version = "1.42.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
tokio-stream = { version = "0.1.17", features = ["fs"], default-features = false }
tokio-util = { version = "0.7.13" }
tonic = { version = "0.12.3", features = ["transport", "tls"], default-features = false }
tracing = { version = "0.1.40", default-features = false }
uuid = { version = "1.10.0", default-features = false, features = ["v4", "serde"] }
tracing = { version = "0.1.41", default-features = false }
uuid = { version = "1.11.0", default-features = false, features = ["v4", "serde"] }

[dev-dependencies]
nativelink-macro = { path = "../nativelink-macro" }
Expand All @@ -65,18 +65,18 @@ pretty_assertions = { version = "1.4.1", features = ["std"] }
memory-stats = "1.2.0"
mock_instant = "0.5.1"
sha2 = { version = "0.10.8", default-features = false }
http = { version = "1.1.0", default-features = false }
aws-smithy-types = "1.2.7"
aws-smithy-runtime = { version = "=1.6.2", features = [
http = { version = "1.2.0", default-features = false }
aws-smithy-types = "1.2.9"
aws-smithy-runtime = { version = "1.7.4", features = [
"test-util",
], default-features = false }
aws-sdk-s3 = { version = "=1.42.0", features = [
aws-sdk-s3 = { version = "1.65.0", features = [
"rt-tokio",
], default-features = false }
aws-smithy-runtime-api = "=1.7.1"
serial_test = { version = "3.1.1", features = [
aws-smithy-runtime-api = "1.7.3"
serial_test = { version = "3.2.0", features = [
"async",
], default-features = false }
serde_json = "1.0.128"
fred = { version = "9.1.2", default-features = false, features = ["mocks"] }
tracing-subscriber = { version = "0.3.18", default-features = false }
serde_json = "1.0.133"
fred = { version = "10.0.1", default-features = false, features = ["mocks"] }
tracing-subscriber = { version = "0.3.19", default-features = false }
Loading