Skip to content

Commit

Permalink
Update tonic -> 0.8.0 (#859)
Browse files Browse the repository at this point in the history
  • Loading branch information
realtimetodie authored Aug 10, 2022
1 parent 399404d commit aec7d0b
Show file tree
Hide file tree
Showing 10 changed files with 362 additions and 206 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.7.1"
tonic = { version = "0.8.0", features = ["tls"] }
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.10.1", optional = true }
tonic = { version = "0.7.1", optional = true }
prost = { version = "0.11.0", optional = true }
tonic = { version = "0.8.0", 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.7.1", optional = true }
prost = { version = "0.10.1", optional = true }
tonic = { version = "0.8.0", optional = true }
prost = { version = "0.11.0", 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.7.1", optional = true }
prost-build = { version = "0.10.1", optional = true }
tonic-build = { version = "0.8.0", optional = true }
prost-build = { version = "0.11.1", optional = true }
8 changes: 4 additions & 4 deletions opentelemetry-stackdriver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ hyper = "0.14.2"
hyper-rustls = { version = "0.23", optional = true }
opentelemetry = { version = "0.17", path = "../opentelemetry" }
opentelemetry-semantic-conventions = { version = "0.9", path = "../opentelemetry-semantic-conventions" }
prost = "0.10.4"
prost-types = "0.10.1"
prost = "0.11.0"
prost-types = "0.11.1"
thiserror = "1.0.30"
tonic = { version = "0.7.2", features = ["tls", "transport"] }
tonic = { version = "0.8.0", features = ["gzip", "tls", "transport"] }
yup-oauth2 = { version = "7.0.1", optional = true }

[features]
Expand All @@ -34,5 +34,5 @@ tls-webpki-roots = ["tonic/tls-webpki-roots"]
reqwest = "0.11.9"
tempfile = "3.3.0"
tokio = "1"
tonic-build = "0.7.2"
tonic-build = "0.8.0"
walkdir = "2.3.2"
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import "google/api/resource.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";
import "google/rpc/status.proto";
import "google/api/annotations.proto";

option csharp_namespace = "Google.Cloud.Trace.V2";
option go_package = "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2;cloudtrace";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/devtools/cloudtrace/v2/trace.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/timestamp.proto";

option csharp_namespace = "Google.Cloud.Trace.V2";
option go_package = "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2;cloudtrace";
Expand Down
Loading

0 comments on commit aec7d0b

Please sign in to comment.