Skip to content

Commit ac9f55e

Browse files
committed
Updating all dependencies
Signed-off-by: Dawid Nowak <[email protected]>
1 parent a9da3ce commit ac9f55e

File tree

19 files changed

+459
-404
lines changed

19 files changed

+459
-404
lines changed

Cargo.lock

Lines changed: 329 additions & 284 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,35 +41,49 @@ orion-tracing = { path = "orion-tracing" }
4141
orion-xds = { path = "orion-xds" }
4242

4343
abort-on-drop = "0.2"
44-
bounded-integer = "0.5.8"
44+
bounded-integer = "0.6.1"
4545
bytes = "1"
46-
compact_str = { version = "0.8.0", features = ["serde"] }
47-
exponential-backoff = "1.2.0"
46+
compact_str = { version = "0.9", features = ["serde"] }
47+
exponential-backoff = "2.1"
4848
futures = "0.3"
49-
http = "1.0"
49+
http = "1.3"
5050
http-body = "1.0"
51-
http-body-util = "0.1.0"
51+
http-body-util = "0.1.3"
5252
num_cpus = "1"
53+
opentelemetry = "0.31"
54+
opentelemetry-otlp = {version = "0.31", features = [
55+
"tonic",
56+
"tokio",
57+
"grpc-tonic",
58+
"hyper-client",
59+
"serde",
60+
"serde_json",
61+
"serialize",
62+
"http-json",
63+
] }
64+
opentelemetry_sdk = "0.31"
5365
ppp = "2.3"
54-
prost = "0.13"
55-
prost-build = "^0.13"
56-
prost-reflect = { version = "0.14", features = ["derive", "serde"] }
57-
regex = "1.10.2"
66+
prost = "0.14"
67+
prost-build = "0.14"
68+
prost-reflect = { version = "0.16", features = ["derive", "serde"] }
69+
regex = "1.12.2"
5870
serde = { version = "1", features = ["derive", "rc"] }
5971
serde_json = { version = "1" }
6072
serde_yaml = "0.9.34"
61-
thiserror = "1.0.57"
62-
tokio = { version = "1.37", features = ["full"] }
63-
tokio-stream = { version = "0.1.15", features = ["net", "sync"] }
64-
tonic = "^0.12"
65-
tonic-build = "^0.12"
66-
tonic-health = "^0.12"
67-
tower = { version = "0.5.1", features = ["make"] }
73+
thiserror = "2.0.17"
74+
tokio = { version = "1.48", features = ["full"] }
75+
tokio-stream = { version = "0.1.17", features = ["net", "sync"] }
76+
tonic = "0.14"
77+
tonic-build = "0.14"
78+
tonic-prost = "0.14"
79+
tonic-prost-build = "0.14"
80+
tonic-health = "0.14"
81+
tower = { version = "0.5.2", features = ["make"] }
6882
tracing = "0.1"
6983
tracing-subscriber = "0.3"
7084
tracing-test = { version = "0.2", features = ["no-env-filter"] }
7185
url = "2"
72-
hyper-util = { version = "0.1.15", features = ["full"] }
86+
hyper-util = { version = "0.1.17", features = ["full"] }
7387

7488

7589
[profile.release]

envoy-data-plane-api/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ serde.workspace = true
1313
serde_json.workspace = true
1414
serde_yaml.workspace = true
1515
tonic.workspace = true
16+
tonic-prost.workspace = true
1617
tonic-health.workspace = true
1718

1819
[build-dependencies]
1920
glob = "^0.3"
2021
prost-build.workspace = true
2122
prost-reflect.workspace = true
2223
tonic-build.workspace = true
23-
24+
tonic-prost-build.workspace = true
2425

2526
[lib]
2627
doctest = false

envoy-data-plane-api/build.rs

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1-
use std::path::PathBuf;
1+
// Copyright 2025 The kmesh Authors
2+
//
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
//
16+
//
217

318
use glob::glob;
19+
use std::path::{Path, PathBuf};
420

521
/// std::env::set_var("PROTOC", The Path of Protoc);
622
fn main() -> std::io::Result<()> {
@@ -15,16 +31,16 @@ fn main() -> std::io::Result<()> {
1531
protos.extend(custom_protos);
1632

1733
let include_paths = [
18-
"data-plane-api/",
19-
"xds/",
20-
"protoc-gen-validate/",
21-
"googleapis/",
22-
"opencensus-proto/src/",
23-
"opentelemetry-proto/",
24-
"prometheus-client-model/",
25-
"cel-spec/proto",
26-
"protobuf/src/",
27-
"udpa/udpa/type/v1",
34+
"./data-plane-api/",
35+
"./xds/",
36+
"./protoc-gen-validate/",
37+
"./googleapis/",
38+
"./opencensus-proto/src/",
39+
"./opentelemetry-proto/",
40+
"./prometheus-client-model/",
41+
"./cel-spec/proto",
42+
"./protobuf/src/",
43+
"./udpa/udpa/type/v1",
2844
"../proto/",
2945
];
3046

@@ -52,13 +68,11 @@ fn main() -> std::io::Result<()> {
5268
.type_attribute(full_name, format!(r#"#[prost_reflect(message_name = "{}")]"#, full_name,))
5369
.type_attribute(full_name, pool_attribute);
5470
}
55-
71+
let include_paths = include_paths.into_iter().map(|p| Path::new(p).to_path_buf()).collect::<Vec<PathBuf>>();
5672
// Proceed w/ tonic_build
57-
tonic_build::configure().build_server(true).build_client(true).compile_protos_with_config(
73+
tonic_prost_build::configure().build_server(true).build_client(true).compile_with_config(
5874
config,
5975
&protos,
6076
&include_paths,
61-
)?;
62-
63-
Ok(())
77+
)
6478
}

orion-configuration/Cargo.toml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,29 @@ version.workspace = true
1111
[dependencies]
1212
base64 = "0.22.1"
1313
base64-serde = "0.7.0"
14-
bounded-integer = { version = "0.5.8", features = ["serde", "types"] }
14+
bounded-integer = { version = "0.6.1", features = ["serde1"] }
1515
bytes.workspace = true
16-
clap = { version = "4.5.46", features = ["derive"] }
16+
clap = { version = "4.5.51", features = ["derive"] }
1717
compact_str.workspace = true
1818
exponential-backoff.workspace = true
1919
http.workspace = true
2020
http-serde-ext = "1.0.2"
2121
humantime-serde = "1.1.1"
22-
ipnet = { version = "2.9", features = ["serde"] }
22+
ipnet = { version = "2.11", features = ["serde"] }
2323
itertools = "0.14.0"
2424
num_cpus.workspace = true
2525
num-traits = "0.2.19"
26-
opentelemetry-otlp = { version = "0.29.0", features = [
27-
"serde",
28-
"serde_json",
29-
"serialize",
30-
] }
26+
opentelemetry-otlp.workspace=true
3127
orion-data-plane-api = { workspace = true, optional = true }
3228
orion-error.workspace = true
3329
orion-format.workspace = true
3430
orion-interner.workspace = true
35-
prost = "0.13.0"
36-
prost-types = "0.13.0"
31+
prost = "0.13.5"
32+
prost-types = "0.13.5"
3733
regex.workspace = true
3834
serde = { workspace = true, features = ["rc"] }
3935
serde_json.workspace = true
40-
serde_path_to_error = "0.1.16"
36+
serde_path_to_error = "0.1.20"
4137
serde_regex = "1.1.0"
4238
serde_yaml.workspace = true
4339
thiserror.workspace = true
@@ -49,7 +45,7 @@ url.workspace = true
4945

5046
[dev-dependencies]
5147
tracing-test.workspace = true
52-
tempfile = "3.8"
48+
tempfile = "3.23"
5349

5450
[features]
5551
default = ["envoy-conversions"]

orion-data-plane-api/tests/bootstrap.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ fn read_static_resource() {
6767
}
6868

6969
#[test]
70+
#[allow(deprecated)]
7071
fn read_dynamic_resource() {
7172
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
7273
path.push("tests");
@@ -92,6 +93,7 @@ fn read_dynamic_resource() {
9293
}
9394

9495
#[test]
96+
#[allow(deprecated)]
9597
fn read_ads_config() {
9698
const ADS_BOOTSTRAP: &str = r#"
9799
dynamic_resources:
@@ -158,6 +160,7 @@ static_resources:
158160
}
159161

160162
#[test]
163+
#[allow(deprecated)]
161164
fn read_mixture_config() {
162165
const BOOTSTRAP: &str = r#"
163166
dynamic_resources:

orion-format/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ orion-http-header.workspace = true
1414
orion-interner.workspace = true
1515
thiserror.workspace = true
1616

17-
ahash = "0.8.11"
18-
bitflags = { version = "2.9.0", features = ["serde"] }
19-
chrono = "0.4.40"
20-
compact_str = "0.8.0"
17+
ahash = "0.8.12"
18+
bitflags = { version = "2.10.0", features = ["serde"] }
19+
chrono = "0.4.42"
20+
compact_str = "0.8.1"
2121
criterion = "0.5.1"
2222
dhat = "0.3.3"
2323
http-serde-ext = "1.0.2"
@@ -26,9 +26,9 @@ itoa = "1.0.15"
2626
ptrie = "0.7.2"
2727
serde = { workspace = true, features = ["rc"] }
2828
smol_str = { version = "0.3.2", features = ["serde"] }
29-
thread_local = "1.1.8"
29+
thread_local = "1.1.9"
3030
traceparent = "0.0.3"
31-
uuid = { version = "1.16.0", features = ["v4"] }
31+
uuid = { version = "1.18.1", features = ["v4"] }
3232

3333
[features]
3434
dhat-heap = []

orion-lib/Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ version.workspace = true
77

88
[dependencies]
99
abort-on-drop.workspace = true
10-
ahash = "0.8.11"
10+
ahash = "0.8.12"
1111
arc-swap = "1.7.1"
1212
arrayvec = "0.7.6"
1313
async-stream = "0.3"
14-
atomic-time = "0.1.4"
14+
atomic-time = "0.1.5"
1515
bytes.workspace = true
1616
compact_str.workspace = true
1717
enum_dispatch = "0.3.13"
1818
exponential-backoff.workspace = true
1919
futures.workspace = true
2020
futures-util = { version = "0.3", default-features = false }
21-
h2 = "0.4.5"
21+
h2 = "0.4.12"
2222
hickory-resolver = { version = "0.24", features = ["system-config"] }
2323
http.workspace = true
2424
http-body.workspace = true
2525
http-body-util.workspace = true
2626
hyper = { version = "1", features = ["full"] }
27-
hyper-rustls = { version = "0.27.1", features = ["default", "http2"] }
27+
hyper-rustls = { version = "0.27.7", features = ["default", "http2"] }
2828
if-addrs = "0.14"
29-
ipnet = "2.9"
29+
ipnet = "2.11"
3030
lru_time_cache = "0.11.11"
31-
multimap = "0.10.0"
32-
once_cell = { version = "1.19" }
33-
opentelemetry = "0.29.0"
31+
multimap = "0.10.1"
32+
once_cell = { version = "1.21" }
33+
opentelemetry.workspace = true
3434
hyper-util.workspace = true
3535
orion-configuration.workspace = true
3636
orion-data-plane-api.workspace = true
@@ -41,17 +41,17 @@ orion-interner.workspace = true
4141
orion-metrics.workspace = true
4242
orion-tracing.workspace = true
4343
orion-xds.workspace = true
44-
parking_lot = "0.12.3"
44+
parking_lot = "0.12.5"
4545
bounded-integer.workspace = true
46-
pin-project = "1.1.5"
46+
pin-project = "1.1.10"
4747
pingora-timeout = "0.3.0"
4848
ppp.workspace = true
4949
pretty-duration = "0.1.1"
5050
rand = { version = "0.8.5", features = ["small_rng"] }
5151
regex.workspace = true
5252
rustc-hash = "1.1.0"
5353
rustls = "0.23"
54-
rustls-pemfile = "2.1"
54+
rustls-pemfile = "2.2"
5555
rustls-platform-verifier = { version = "0.3" }
5656
rustls-webpki = "0.102"
5757
scopeguard = "1.2.0"
@@ -60,19 +60,19 @@ serde.workspace = true
6060
smol_str = "0.3.2"
6161
thiserror.workspace = true
6262
thread-id = "5.0.0"
63-
thread_local = "1.1.8"
63+
thread_local = "1.1.9"
6464
tokio.workspace = true
6565
tokio-rustls = "0.26"
6666
tokio-stream.workspace = true
6767
tower.workspace = true
68-
tower-service = "0.3.2"
68+
tower-service = "0.3.3"
6969
traceparent = "0.0.3"
7070
tracing.workspace = true
7171
tracing-appender = "0.2.3"
7272
twox-hash = "1.6.3"
7373
typed-builder = "0.18.2"
7474
url.workspace = true
75-
uuid = { version = "1.17.0", features = ["v4"] }
75+
uuid = { version = "1.18.1", features = ["v4"] }
7676
x509-parser = { version = "0.17", features = ["default"] }
7777
hyperlocal = "0.9.1"
7878
tokio-util = "0.7.16"

orion-lib/src/clusters/cluster/dynamic.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use orion_configuration::config::{
2222
ClusterLoadAssignment as ClusterLoadAssignmentConfig, HealthCheck, HealthStatus,
2323
LbEndpoint as LbEndpointConfig, LbPolicy, LocalityLbEndpoints as LocalityLbEndpointsConfig,
2424
},
25-
core::envoy_conversions::Address,
2625
transport::BindDeviceOptions,
2726
};
2827

orion-lib/src/listeners/listener.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ enum ListenerAddress {
7272
Internal(InternalListenerConfig),
7373
}
7474

75+
#[allow(dead_code)]
7576
#[derive(Debug, Clone)]
7677
struct InternalListenerConfig {
7778
buffer_size_kb: Option<u32>,

0 commit comments

Comments
 (0)