Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ddd667a

Browse files
committedAug 14, 2024·
Reapply "chore: bump tonic to v0.12 (#17889)"
This reverts commit 756d840.
1 parent 219a77e commit ddd667a

File tree

59 files changed

+513
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+513
-329
lines changed
 

‎Cargo.lock

+238-122
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+11-7
Original file line numberDiff line numberDiff line change
@@ -121,19 +121,19 @@ aws-smithy-types = { version = "1", default-features = false, features = [
121121
aws-endpoint = "0.60"
122122
aws-types = "1"
123123
axum = "=0.7.4" # TODO: 0.7.5+ does not work with current toolchain
124-
etcd-client = { package = "madsim-etcd-client", version = "0.4" }
124+
etcd-client = { package = "madsim-etcd-client", version = "0.6" }
125125
futures-async-stream = "0.2.9"
126126
hytra = "0.1"
127127
rdkafka = { package = "madsim-rdkafka", version = "0.4.1", features = [
128128
"cmake-build",
129129
] }
130130
hashbrown = { version = "0.14", features = ["ahash", "inline-more", "nightly"] }
131131
criterion = { version = "0.5", features = ["async_futures"] }
132-
tonic = { package = "madsim-tonic", version = "0.4.1" }
133-
tonic-build = { package = "madsim-tonic-build", version = "0.4.2" }
134-
otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev = "492c244e0be91feb659c0cd48a624bbd96045a33" }
135-
prost = { version = "0.12" }
136-
prost-build = { version = "0.12" }
132+
tonic = { package = "madsim-tonic", version = "0.5.1" }
133+
tonic-build = { package = "madsim-tonic-build", version = "0.5" }
134+
otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev = "e6cd165b9bc85783b42c106e99186b86b73e3507" }
135+
prost = { version = "0.13" }
136+
prost-build = { version = "0.13" }
137137
icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "1860eb315183a5f3f72b4097c1e40d49407f8373", features = [
138138
"prometheus",
139139
] }
@@ -180,6 +180,7 @@ tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git"
180180
"profiling",
181181
"stats",
182182
], rev = "64a2d9" }
183+
# TODO(http-bump): bump to use tonic 0.12 once minitrace-opentelemetry is updated
183184
opentelemetry = "0.23"
184185
opentelemetry-otlp = "0.16"
185186
opentelemetry_sdk = { version = "0.23", default-features = false }
@@ -195,6 +196,7 @@ sea-orm = { version = "0.12.14", features = [
195196
"runtime-tokio-native-tls",
196197
] }
197198
sqlx = "0.7"
199+
tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0dd1055", features = ["net", "fs"] }
198200
tokio-util = "0.7"
199201
tracing-opentelemetry = "0.24"
200202
rand = { version = "0.8", features = ["small_rng"] }
@@ -335,7 +337,9 @@ opt-level = 2
335337
# Patch third-party crates for deterministic simulation.
336338
quanta = { git = "https://github.com/madsim-rs/quanta.git", rev = "948bdc3" }
337339
getrandom = { git = "https://github.com/madsim-rs/getrandom.git", rev = "e79a7ae" }
338-
tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e" }
340+
# Don't patch `tokio-stream`, but only use the madsim version for **direct** dependencies.
341+
# Imagine an unpatched dependency depends on the original `tokio` and the patched `tokio-stream`.
342+
# tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0dd1055" }
339343
tokio-retry = { git = "https://github.com/madsim-rs/rust-tokio-retry.git", rev = "95e2fd3" }
340344
tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88" }
341345
futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" }

0 commit comments

Comments
 (0)
Please sign in to comment.