Update tonic, prost, and friends (#660)

* Update tonic, prost, and friends

* Patch tonic to `master` which uses 2018 edition

* remove patch now that tonic is released

* format

examples/external-otlp-tonic-tokio/Cargo.toml

@@ -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.5.0"
+tonic = "0.6.2"
 url = "2.2.0"

examples/grpc/Cargo.toml

@@ -16,11 +16,11 @@ doc = false
 
 [dependencies]
 http = "0.2"
-tonic = "0.5"
-prost = "0.8"
+tonic = "0.6.2"
+prost = "0.9"
 tokio = { version = "1.0", features = ["full"] }
 opentelemetry = { path = "../../opentelemetry" }
 opentelemetry-jaeger = { path = "../../opentelemetry-jaeger" }
 
 [build-dependencies]
-tonic-build = "0.5"
+tonic-build = "0.6.2"

examples/tracing-grpc/Cargo.toml

@@ -14,8 +14,8 @@ path = "src/client.rs"
 
 [dependencies]
 http = "0.2"
-tonic = "0.5"
-prost = "0.8"
+tonic = "0.6.2"
+prost = "0.9"
 tokio = { version = "1.0", features = ["full"] }
 opentelemetry = { version = "0.14", features = ["rt-tokio"] }
 opentelemetry-jaeger = "0.13"
@@ -25,4 +25,4 @@ tracing-opentelemetry = "0.13"
 tracing-futures = "0.2"
 
 [build-dependencies]
-tonic-build = "0.5"
+tonic-build = "0.6.2"

opentelemetry-otlp/Cargo.toml

@@ -40,10 +40,10 @@ futures = { version = "0.3", default-features = false, features = ["std"] }
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
 grpcio = { version = "0.9", optional = true }
 opentelemetry = { version = "0.16", default-features = false, features = ["trace"], path = "../opentelemetry" }
-prost = { version = "0.8", optional = true }
+prost = { version = "0.9", optional = true }
 protobuf = { version = "2.18", optional = true }
 thiserror = "1.0"
-tonic = { version = "0.5", optional = true }
+tonic = { version = "0.6.2", optional = true }
 tokio = { version = "1.0", features = ["full"], optional = true }
 opentelemetry-http = { version = "0.5", path = "../opentelemetry-http", optional = true }
 reqwest = { version = "0.11", optional = true, default-features = false }
@@ -80,5 +80,5 @@ reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
 surf-client = ["surf", "opentelemetry-http/surf"]
 
 [build-dependencies]
-tonic-build = { version = "0.5", default-features = false, features = ["transport", "prost"], optional = true }
-prost-build = {version = "0.8", optional = true }
+tonic-build = { version = "0.6.2", default-features = false, features = ["transport", "prost"], optional = true }
+prost-build = { version = "0.9", optional = true }

opentelemetry-otlp/src/metric.rs

@@ -274,14 +274,10 @@ impl MetricsExporter {
             None => endpoint,
         }
         .timeout(config.timeout)
-        .connect_lazy()
-        .map_err::<crate::Error, _>(Into::into)?;
+        .connect_lazy();
 
         #[cfg(not(feature = "tls"))]
-        let channel = endpoint
-            .timeout(config.timeout)
-            .connect_lazy()
-            .map_err::<crate::Error, _>(Into::into)?;
+        let channel = endpoint.timeout(config.timeout).connect_lazy();
 
         let client = MetricsServiceClient::new(channel);
 

opentelemetry-otlp/src/span.rs

@@ -338,10 +338,10 @@ impl SpanExporter {
             None => endpoint,
         }
         .timeout(config.timeout)
-        .connect_lazy()?;
+        .connect_lazy();
 
         #[cfg(not(feature = "tls"))]
-        let channel = endpoint.timeout(config.timeout).connect_lazy()?;
+        let channel = endpoint.timeout(config.timeout).connect_lazy();
 
         SpanExporter::from_tonic_channel(config, tonic_config, channel)
     }

opentelemetry-stackdriver/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tonic-build = "0.5.0"
+tonic-build = "0.6.2"
 which = "4.0.2"
 
 [dependencies]
@@ -24,10 +24,10 @@ hyper = "0.14.2"
 hyper-rustls = { version = "0.22.1", optional = true }
 log = "0.4"
 opentelemetry = { version = "0.16", path = "../opentelemetry" }
-prost = "0.8"
-prost-types = "0.8"
+prost = "0.9"
+prost-types = "0.9"
 rustls = "0.19"
-tonic = { version = "0.5", features = ["tls", "transport"] }
+tonic = { version = "0.6.2", features = ["tls", "transport"] }
 tokio = { version = "1.1", optional = true }
 yup-oauth2 = { version = "5.0.1", optional = true }
 webpki-roots = "0.21"