Skip to content

Commit

Permalink
opentelemetry-otlp: upgrade to tonic 0.7 (#783)
Browse files Browse the repository at this point in the history
Co-authored-by: Zhongyang Wu <zhongyang.wu@outlook.com>
  • Loading branch information
benesch and TommyCpp committed May 1, 2022
1 parent f4f8d58 commit 90a70ee
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion examples/external-otlp-tonic-tokio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ opentelemetry = { path = "../../opentelemetry", features = ["rt-tokio", "metrics
opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic", "tls", "tls-roots"] }
serde_json = "1.0"
tokio = { version = "1.0", features = ["full"] }
tonic = "0.6.2"
tonic = "0.7.1"
url = "2.2.0"
4 changes: 2 additions & 2 deletions opentelemetry-otlp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ opentelemetry = { version = "0.17", default-features = false, features = ["trace
opentelemetry-http = { version = "0.6", path = "../opentelemetry-http", optional = true }
protobuf = { version = "2.18", optional = true }

prost = { version = "0.9", optional = true }
tonic = { version = "0.6.2", optional = true }
prost = { version = "0.10.1", optional = true }
tonic = { version = "0.7.1", optional = true }
tokio = { version = "1.0", features = ["sync", "rt"], optional = true }

reqwest = { version = "0.11", optional = true, default-features = false }
Expand Down
8 changes: 4 additions & 4 deletions opentelemetry-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ build-client = []

[dependencies]
grpcio = { version = "0.9", optional = true }
tonic = { version = "0.6.2", optional = true }
prost = { version = "0.9", optional = true }
tonic = { version = "0.7.1", optional = true }
prost = { version = "0.10.1", optional = true }
protobuf = { version = "2.18", optional = true } # todo: update to 3.0 so we have docs for generated types.
opentelemetry = { version = "0.17", default-features = false, features = ["trace", "metrics"], path = "../opentelemetry" }
futures = { version = "0.3", default-features = false, features = ["std"] }
Expand All @@ -61,5 +61,5 @@ protobuf-codegen = { version = "2.16" }
protoc-grpcio = { version = "3.0" }

[build-dependencies]
tonic-build = { version = "0.6.2", optional = true }
prost-build = { version = "0.9", optional = true }
tonic-build = { version = "0.7.1", optional = true }
prost-build = { version = "0.10.1", optional = true }
1 change: 0 additions & 1 deletion opentelemetry-proto/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ fn main() -> Result<(), Error> {
tonic_build::configure()
.build_server(cfg!(feature = "build-server"))
.build_client(cfg!(feature = "build-client"))
.format(false)
.compile(
&[
"src/proto/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto",
Expand Down

0 comments on commit 90a70ee

Please sign in to comment.