Skip to content

Commit 2c0ee77

Browse files
Merge branch 'main' into tianning.li/v93-degradation-investigation
2 parents a783c82 + 663d891 commit 2c0ee77

File tree

3 files changed

+30
-88
lines changed

3 files changed

+30
-88
lines changed

bottlecap/Cargo.lock

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

bottlecap/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ rustls-pki-types = { version = "1.0", default-features = false }
4545
hyper-rustls = { version = "0.27.7", default-features = false }
4646
rand = { version = "0.8", default-features = false }
4747
prost = { version = "0.13", default-features = false }
48-
tonic-types = { version = "0.12", default-features = false }
48+
tonic-types = { version = "0.13", default-features = false }
4949
zstd = { version = "0.13.3", default-features = false }
5050
futures = { version = "0.3.31", default-features = false }
5151
serde-aux = { version = "4.7", default-features = false }
5252
serde_html_form = { version = "0.2", default-features = false }
53-
opentelemetry-proto = { version = "0.29", features = ["trace", "with-serde", "gen-tonic"] }
53+
opentelemetry-proto = { version = "0.30.0", features = ["trace", "with-serde", "gen-tonic"] }
5454
opentelemetry-semantic-conventions = { version = "0.30", features = ["semconv_experimental"] }
5555
rustls-native-certs = { version = "0.8.1", optional = true }
5656
axum = { version = "0.8.4", default-features = false, features = ["default"] }

bottlecap/LICENSE-3rdparty.csv

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ futures-task,https://github.com/rust-lang/futures-rs,MIT OR Apache-2.0,The futur
6161
futures-util,https://github.com/rust-lang/futures-rs,MIT OR Apache-2.0,The futures-util Authors
6262
generic-array,https://github.com/fizyk20/generic-array,MIT,"Bartłomiej Kamiński <[email protected]>, Aaron Trent <[email protected]>"
6363
getrandom,https://github.com/rust-random/getrandom,MIT OR Apache-2.0,The Rand Project Developers
64-
glob,https://github.com/rust-lang/glob,MIT OR Apache-2.0,The Rust Project Developers
6564
h2,https://github.com/hyperium/h2,MIT,"Carl Lerche <[email protected]>, Sean McArthur <[email protected]>"
6665
hashbrown,https://github.com/rust-lang/hashbrown,MIT OR Apache-2.0,Amanieu d'Antras <[email protected]>
6766
headers,https://github.com/hyperium/headers,MIT,Sean McArthur <[email protected]>
@@ -87,7 +86,6 @@ icu_properties_data,https://github.com/unicode-org/icu4x,Unicode-3.0,The ICU4X P
8786
icu_provider,https://github.com/unicode-org/icu4x,Unicode-3.0,The ICU4X Project Developers
8887
idna,https://github.com/servo/rust-url,MIT OR Apache-2.0,The rust-url developers
8988
idna_adapter,https://github.com/hsivonen/idna_adapter,Apache-2.0 OR MIT,The rust-url developers
90-
indexmap,https://github.com/bluss/indexmap,Apache-2.0 OR MIT,The indexmap Authors
9189
indexmap,https://github.com/indexmap-rs/indexmap,Apache-2.0 OR MIT,The indexmap Authors
9290
inlinable_string,https://github.com/fitzgen/inlinable_string,Apache-2.0 OR MIT,Nick Fitzgerald <[email protected]>
9391
ipnet,https://github.com/krisprice/ipnet,MIT OR Apache-2.0,Kris Price <[email protected]>

0 commit comments

Comments
 (0)