Skip to content

Commit 44ced0b

Browse files
committed
# This is a combination of 2 commits.
# This is the 1st commit message: chore: update tonic and prost to 0.14 # The commit message #2 will be skipped: # Change msrv to 1.86
1 parent 42139cb commit 44ced0b

File tree

16 files changed

+32
-28
lines changed

16 files changed

+32
-28
lines changed

Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,18 @@ hyper-util = "0.1"
3232
log = "0.4.21"
3333
once_cell = "1.13"
3434
pin-project-lite = "0.2"
35-
prost = "0.13"
36-
prost-build = "0.13"
37-
prost-types = "0.13"
35+
prost = "0.14"
36+
prost-build = "0.14"
37+
prost-types = "0.14"
3838
rand = { version = "0.9", default-features = false }
3939
reqwest = { version = "0.12", default-features = false }
4040
serde = { version = "1.0", default-features = false }
4141
serde_json = "1.0"
4242
temp-env = "0.3.6"
4343
thiserror = { version = "2", default-features = false }
44-
tonic = { version = "0.13", default-features = false }
45-
tonic-build = "0.13"
44+
tonic = { version = "0.14", default-features = false }
45+
tonic-prost-build = "0.14"
46+
tonic-prost = "0.14"
4647
tokio = { version = "1", default-features = false }
4748
tokio-stream = "0.1"
4849
# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,

examples/tracing-grpc/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "tracing-grpc"
33
version = "0.1.0"
44
edition = "2021"
55
license = "Apache-2.0"
6-
rust-version = "1.75.0"
6+
rust-version = "1.86.0"
77
publish = false
88
autobenches = false
99

@@ -23,10 +23,11 @@ opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"]
2323
opentelemetry-stdout = { workspace = true, features = ["trace"] }
2424
prost = { workspace = true }
2525
tokio = { workspace = true, features = ["full"] }
26-
tonic = { workspace = true, features = ["server", "codegen", "channel", "prost", "router"] }
26+
tonic = { workspace = true, features = ["server", "codegen", "channel", "router"] }
27+
tonic-prost = { workspace = true }
2728

2829
[build-dependencies]
29-
tonic-build = { workspace = true }
30+
tonic-prost-build = { workspace = true }
3031

3132
[package.metadata.cargo-machete]
3233
ignored = [

examples/tracing-grpc/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fn main() -> Result<(), Box<dyn std::error::Error>> {
2-
tonic_build::compile_protos("proto/helloworld.proto")?;
2+
tonic_prost_build::compile_protos("proto/helloworld.proto")?;
33
Ok(())
44
}

opentelemetry-otlp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = [
1313
keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
1414
license = "Apache-2.0"
1515
edition = "2021"
16-
rust-version = "1.75.0"
16+
rust-version = "1.86.0"
1717
autotests = false
1818
autobenches = false
1919

opentelemetry-otlp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can find the release notes (changelog) [here](https://github.com/open-teleme
4646
## Supported Rust Versions
4747

4848
OpenTelemetry is built against the latest stable release. The minimum supported
49-
version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
49+
version is 1.86.0. The current OpenTelemetry version is not guaranteed to build
5050
on Rust versions earlier than the minimum supported version.
5151

5252
The current stable Rust compiler and the three most recent minor versions

opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "basic-otlp-http"
33
version = "0.1.0"
44
edition = "2021"
55
license = "Apache-2.0"
6-
rust-version = "1.75.0"
6+
rust-version = "1.86.0"
77
publish = false
88
autobenches = false
99

opentelemetry-otlp/examples/basic-otlp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "basic-otlp"
33
version = "0.1.0"
44
edition = "2021"
55
license = "Apache-2.0"
6-
rust-version = "1.75.0"
6+
rust-version = "1.86.0"
77
publish = false
88
autobenches = false
99

opentelemetry-otlp/tests/integration_test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "integration_test_runner"
33
version = "0.1.0"
44
edition = "2021"
55
license = "Apache-2.0"
6-
rust-version = "1.75.0"
6+
rust-version = "1.86.0"
77
publish = false
88
autobenches = false
99

opentelemetry-proto/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- Update proto definitions to v1.7.0.
66
- Added Rust generated protos for profiles collector. [#3077](https://github.com/open-telemetry/opentelemetry-rust/pull/3077)
77
- **Breaking change**: package opentelemetry_proto::tonic::profiles::v1 renamed to opentelemetry_proto::tonic::profiles::v1development. [#3077](https://github.com/open-telemetry/opentelemetry-rust/pull/3077)
8+
- Update `tonic` and `prost` dependency version to 0.14
89

910
## 0.30.0
1011

opentelemetry-proto/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = [
1313
keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
1414
license = "Apache-2.0"
1515
edition = "2021"
16-
rust-version = "1.75.0"
16+
rust-version = "1.86.0"
1717
autotests = false
1818
autobenches = false
1919

@@ -36,7 +36,7 @@ full = ["gen-tonic", "trace", "logs", "metrics", "zpages", "with-serde", "intern
3636

3737
# crates used to generate rs files
3838
gen-tonic = ["gen-tonic-messages", "tonic/channel"]
39-
gen-tonic-messages = ["tonic", "prost"]
39+
gen-tonic-messages = ["tonic", "tonic-prost", "prost"]
4040

4141
# telemetry pillars and functions
4242
trace = ["opentelemetry/trace", "opentelemetry_sdk/trace"]
@@ -52,7 +52,8 @@ with-schemars = ["schemars"]
5252
with-serde = ["serde", "const-hex", "base64"]
5353

5454
[dependencies]
55-
tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
55+
tonic = { workspace = true, optional = true, features = ["codegen"] }
56+
tonic-prost = { workspace = true, optional = true }
5657
prost = { workspace = true, optional = true }
5758
opentelemetry = { version = "0.30", default-features = false, path = "../opentelemetry" }
5859
opentelemetry_sdk = { version = "0.30", default-features = false, path = "../opentelemetry-sdk" }
@@ -63,7 +64,7 @@ base64 = { workspace = true, optional = true }
6364

6465
[dev-dependencies]
6566
opentelemetry = { features = ["testing"], path = "../opentelemetry" }
66-
tonic-build = { workspace = true }
67+
tonic-prost-build = { workspace = true }
6768
prost-build = { workspace = true }
6869
tempfile = { workspace = true }
6970
serde_json = { workspace = true }

0 commit comments

Comments
 (0)