Skip to content

Commit

Permalink
chore: loosen tonic/prost version bounds
Browse files Browse the repository at this point in the history
This permits using tonic 0.10.

Fix #1458
  • Loading branch information
edef1c committed Dec 29, 2023
1 parent 5aa0311 commit b5344f4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions examples/tracing-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ path = "src/client.rs"
opentelemetry = { path = "../../opentelemetry" }
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"]}
opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace"] }
prost = "0.11"
prost = "0.12.3"
tokio = { version = "1.28", features = ["full"] }
tonic = "0.9.2"
tonic = "0.10.2"

[build-dependencies]
tonic-build = "0.9.2"
4 changes: 2 additions & 2 deletions opentelemetry-otlp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ opentelemetry-http = { version = "0.10", path = "../opentelemetry-http", optiona
opentelemetry-proto = { version = "0.4", path = "../opentelemetry-proto", default-features = false }
opentelemetry-semantic-conventions = { version = "0.13", path = "../opentelemetry-semantic-conventions" }

prost = { version = "0.11.0", optional = true }
tonic = { version = "0.9.0", optional = true }
prost = { version = ">=0.11.0 <0.13", optional = true }
tonic = { version = ">=0.9.0 <0.11", optional = true }
tokio = { version = "1.0", features = ["sync", "rt"], optional = true }

reqwest = { version = "0.11", optional = true, default-features = false }
Expand Down
5 changes: 3 additions & 2 deletions opentelemetry-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ with-serde = ["serde"]

[dependencies]
grpcio = { version = "0.12", optional = true, features = ["prost-codec"] }
tonic = { version = "0.9.0", default-features = false, optional = true, features = ["codegen", "prost"] }
prost = { version = "0.11.0", optional = true }

tonic = { version = ">=0.9.0 <0.11", default-features = false, optional = true, features = ["codegen", "prost"] }
prost = { version = ">=0.11.0 <0.13", optional = true }
opentelemetry = { version = "0.21", default-features = false, path = "../opentelemetry" }
opentelemetry_sdk = { version = "0.21", default-features = false, path = "../opentelemetry-sdk" }
schemars = { version = "0.8", optional = true }
Expand Down

0 comments on commit b5344f4

Please sign in to comment.