From a428c067fe5027c0e4e83d01945d2b8c796a3092 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Wed, 27 Oct 2021 12:28:38 -0700 Subject: [PATCH] update `tonic`, `prost`, and `linkerd2-proxy-api` (#1339) This branch updates the proxy's `tonic` dependencies to `tonic` 0.6, `prost` to 0.9, and `linkerd2-proxy-api` to 0.3 (which updates the proxy-api crate's `prost` and `tonic` dependencies). Closes #1329. Closes #1337. Closes #1338. Signed-off-by: Eliza Weisman (cherry picked from commit 917797a499f53b841873d1d771b7f35bc1bd4fe0) Signed-off-by: Oliver Gould --- Cargo.lock | 94 ++++++++++++++-------------- linkerd/app/Cargo.toml | 2 +- linkerd/app/core/Cargo.toml | 2 +- linkerd/app/inbound/Cargo.toml | 4 +- linkerd/app/integration/Cargo.toml | 4 +- linkerd/app/integration/src/tap.rs | 10 +-- linkerd/opencensus/Cargo.toml | 2 +- linkerd/proxy/api-resolve/Cargo.toml | 6 +- linkerd/proxy/identity/Cargo.toml | 4 +- linkerd/proxy/tap/Cargo.toml | 8 +-- linkerd/service-profiles/Cargo.toml | 8 +-- linkerd/tonic-watch/Cargo.toml | 2 +- linkerd/transport-header/Cargo.toml | 4 +- opencensus-proto/Cargo.toml | 8 +-- 14 files changed, 80 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d9c1603b8..597d68a6b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -99,9 +99,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" [[package]] name = "byteorder" @@ -117,9 +117,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cc" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" [[package]] name = "cfg-if" @@ -194,9 +194,9 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" [[package]] name = "flate2" @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] @@ -1466,9 +1466,9 @@ dependencies = [ [[package]] name = "linkerd2-proxy-api" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd6c04afc63a89097087d760af86cf858009f63694b849be33f37fcf5bd8df8" +checksum = "9d20d7fd6e5b0f0af5cecca5deded293266ae5cfb3aff31ef632da48640ca522" dependencies = [ "h2", "http", @@ -1547,9 +1547,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -1657,9 +1657,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "petgraph" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ "fixedbitset", "indexmap", @@ -1699,15 +1699,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro2" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" dependencies = [ "unicode-xid", ] @@ -1726,9 +1726,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", "prost-derive", @@ -1736,27 +1736,29 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck", "itertools", + "lazy_static", "log", "multimap", "petgraph", "prost", "prost-types", + "regex", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", @@ -1767,9 +1769,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", "prost", @@ -1792,9 +1794,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -1986,9 +1988,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740223c51853f3145fe7c90360d2d4232f2b62e3449489c207eccde818979982" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] @@ -2004,15 +2006,15 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "socket2" @@ -2043,9 +2045,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "syn" -version = "1.0.76" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" dependencies = [ "proc-macro2", "quote", @@ -2097,9 +2099,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5241dd6f21443a3606b432718b166d3cedc962fd4b8bea54a8bc7f514ebda986" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -2142,9 +2144,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" +checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd" dependencies = [ "proc-macro2", "quote", @@ -2203,9 +2205,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" +checksum = "13f2aeb38f03d458a20b567d26716c0b6e4f27fc9bbc70c4e45933ef4037a0bc" dependencies = [ "async-stream", "async-trait", @@ -2234,9 +2236,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08" +checksum = "88358bb1dcfeb62dcce85c63006cafb964b7be481d522b7e09589d4d1e718d2a" dependencies = [ "proc-macro2", "prost-build", @@ -2430,9 +2432,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "unicode-bidi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml index 28e49b4f7a..7ff119ae90 100644 --- a/linkerd/app/Cargo.toml +++ b/linkerd/app/Cargo.toml @@ -27,6 +27,6 @@ regex = "1.5.4" thiserror = "1.0" tokio = { version = "1", features = ["rt"] } tokio-stream = { version = "0.1.7", features = ["time", "sync"] } -tonic = { version = "0.5", default-features = false, features = ["prost"] } +tonic = { version = "0.6", default-features = false, features = ["prost"] } tower = "0.4.10" tracing = "0.1.29" diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index 28f4a18af3..3011249ebf 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -63,7 +63,7 @@ serde_json = "1" thiserror = "1.0" tokio = { version = "1", features = ["macros", "sync", "parking_lot"]} tokio-stream = { version = "0.1.7", features = ["time"] } -tonic = { version = "0.5", default-features = false, features = ["prost"] } +tonic = { version = "0.6", default-features = false, features = ["prost"] } tracing = "0.1.29" parking_lot = "0.11" pin-project = "1" diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml index 666c47b087..e5f1e8b618 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -16,11 +16,11 @@ futures = { version = "0.3", default-features = false } linkerd-app-core = { path = "../core" } linkerd-server-policy = { path = "../../server-policy" } linkerd-tonic-watch = { path = "../../tonic-watch" } -linkerd2-proxy-api = { version = "0.2", features = ["client", "inbound"] } +linkerd2-proxy-api = { version = "0.3", features = ["client", "inbound"] } parking_lot = "0.11" thiserror = "1.0" tokio = { version = "1", features = ["sync"] } -tonic = { version = "0.5", default-features = false } +tonic = { version = "0.6", default-features = false } tower = { version = "0.4.10", features = ["util"] } tracing = "0.1.29" diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 708d989f8a..f9d11bf3ee 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -26,7 +26,7 @@ hyper = { version = "0.14.14", features = ["http1", "http2", "stream", "client", linkerd-app = { path = "..", features = ["allow-loopback"] } linkerd-app-core = { path = "../core" } linkerd-metrics = { path = "../../metrics", features = ["test_util"] } -linkerd2-proxy-api = { version = "0.2", features = ["destination", "arbitrary"] } +linkerd2-proxy-api = { version = "0.3", features = ["destination", "arbitrary"] } linkerd-app-test = { path = "../test" } linkerd-tracing = { path = "../../tracing" } regex = "1" @@ -35,7 +35,7 @@ tokio = { version = "1", features = ["io-util", "net", "rt", "macros"] } tokio-stream = { version = "0.1.7", features = ["sync"] } tokio-rustls = "0.22" tower = { version = "0.4.10", default-features = false } -tonic = { version = "0.5", default-features = false } +tonic = { version = "0.6", default-features = false } tracing = "0.1.29" webpki = "0.21" tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] } diff --git a/linkerd/app/integration/src/tap.rs b/linkerd/app/integration/src/tap.rs index 7dbfc5c9b9..66f106b062 100644 --- a/linkerd/app/integration/src/tap.rs +++ b/linkerd/app/integration/src/tap.rs @@ -21,7 +21,7 @@ impl Client { pub async fn observe( &mut self, req: ObserveBuilder, - ) -> Pin> + Send + Sync>> { + ) -> Pin> + Send>> { let req = tonic::Request::new(req.0); match self.api.observe(req).await { Ok(rsp) => Box::pin(rsp.into_inner()), @@ -33,7 +33,7 @@ impl Client { &mut self, req: ObserveBuilder, require_id: &str, - ) -> Pin> + Send + Sync>> { + ) -> Pin> + Send>> { let mut req = tonic::Request::new(req.0); let require_id = tonic::metadata::MetadataValue::from_str(require_id).unwrap(); @@ -192,9 +192,9 @@ type ResponseFuture = impl tower::Service> for SyncSvc where - B: Body + Send + Sync + 'static, - B::Data: Send + Sync + 'static, - B::Error: Send + Sync + 'static, + B: Body + Send + 'static, + B::Data: Send + 'static, + B::Error: Send + 'static, { type Response = http::Response; type Error = String; diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml index 47b9ae6646..732e3ef732 100644 --- a/linkerd/opencensus/Cargo.toml +++ b/linkerd/opencensus/Cargo.toml @@ -13,7 +13,7 @@ http-body = "0.4" linkerd-error = { path = "../error" } linkerd-metrics = { path = "../metrics" } opencensus-proto = { path = "../../opencensus-proto" } -tonic = { version = "0.5", default-features = false, features = ["prost", "codegen"] } +tonic = { version = "0.6", default-features = false, features = ["prost", "codegen"] } tokio = { version = "1", features = ["macros", "sync", "time"] } tokio-stream = { version = "0.1.7", features = ["sync"] } tracing = "0.1.29" diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml index 78928dc942..c4238a0004 100644 --- a/linkerd/proxy/api-resolve/Cargo.toml +++ b/linkerd/proxy/api-resolve/Cargo.toml @@ -17,14 +17,14 @@ async-stream = "0.3" futures = { version = "0.3", default-features = false } linkerd-addr = { path = "../../addr" } linkerd-error = { path = "../../error" } -linkerd2-proxy-api = { version = "0.2", features = ["destination", "client"] } +linkerd2-proxy-api = { version = "0.3", features = ["destination", "client"] } linkerd-proxy-core = { path = "../core" } linkerd-stack = { path = "../../stack" } linkerd-tls = { path = "../../tls" } http = "0.2" http-body = "0.4" pin-project = "1" -prost = "0.8" -tonic = { version = "0.5", default-features = false } +prost = "0.9" +tonic = { version = "0.6", default-features = false } tower = { version = "0.4.10", default-features = false } tracing = "0.1.29" diff --git a/linkerd/proxy/identity/Cargo.toml b/linkerd/proxy/identity/Cargo.toml index 3ef06dc669..701b5c1711 100644 --- a/linkerd/proxy/identity/Cargo.toml +++ b/linkerd/proxy/identity/Cargo.toml @@ -11,7 +11,7 @@ rustfmt = ["linkerd2-proxy-api/rustfmt"] [dependencies] futures = { version = "0.3", default-features = false } -linkerd2-proxy-api = { version = "0.2", features = ["identity", "client"] } +linkerd2-proxy-api = { version = "0.3", features = ["identity", "client"] } linkerd-error = { path = "../../error" } linkerd-identity = { path = "../../identity" } linkerd-metrics = { path = "../../metrics" } @@ -19,7 +19,7 @@ linkerd-stack = { path = "../../stack" } linkerd-tls = { path = "../../tls" } thiserror = "1" tokio = { version = "1", features = ["time", "sync"] } -tonic = { version = "0.5", default-features = false } +tonic = { version = "0.6", default-features = false } tracing = "0.1.29" http-body = "0.4" pin-project = "1" diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index ed613e0ab1..5f00d83c72 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -14,7 +14,7 @@ http = "0.2" hyper = { version = "0.14.14", features = ["http1", "http2"] } futures = { version = "0.3", default-features = false } ipnet = "2.3" -linkerd2-proxy-api = { version = "0.2", features = ["tap", "server"] } +linkerd2-proxy-api = { version = "0.3", features = ["tap", "server"] } linkerd-conditional = { path = "../../conditional" } linkerd-error = { path = "../../error" } linkerd-identity = { path = "../../identity" } @@ -27,11 +27,11 @@ rand = { version = "0.8" } thiserror = "1.0" tokio = { version = "1", features = ["time"]} tower = { version = "0.4.10", default-features = false } -tonic = { version = "0.5", default-features = false } +tonic = { version = "0.6", default-features = false } tracing = "0.1.29" pin-project = "1" [dev-dependencies] -linkerd2-proxy-api = { version = "0.2", features = ["arbitrary"] } -prost-types = "0.8.0" +linkerd2-proxy-api = { version = "0.3", features = ["arbitrary"] } +prost-types = "0.9" quickcheck = { version = "1", default-features = false } diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml index d25fe1fbdb..42c9099706 100644 --- a/linkerd/service-profiles/Cargo.toml +++ b/linkerd/service-profiles/Cargo.toml @@ -25,18 +25,18 @@ linkerd-http-box = { path = "../http-box" } linkerd-proxy-api-resolve = { path = "../proxy/api-resolve" } linkerd-stack = { path = "../stack" } linkerd-tonic-watch = { path = "../tonic-watch" } -linkerd2-proxy-api = { version = "0.2", features = ["destination", "client"] } +linkerd2-proxy-api = { version = "0.3", features = ["destination", "client"] } rand = { version = "0.8", features = ["small_rng"] } regex = "1.5.4" tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } tokio-stream = { version = "0.1", features = ["sync"] } -tonic = { version = "0.5", default-features = false } +tonic = { version = "0.6", default-features = false } tower = { version = "0.4.10", features = [ "ready-cache", "retry", "util"] } thiserror = "1" tracing = "0.1.29" pin-project = "1" [dev-dependencies] -linkerd2-proxy-api = { version = "0.2", features = ["arbitrary"] } -prost-types = "0.8.0" +linkerd2-proxy-api = { version = "0.3", features = ["arbitrary"] } +prost-types = "0.9" quickcheck = { version = "1", default-features = false } diff --git a/linkerd/tonic-watch/Cargo.toml b/linkerd/tonic-watch/Cargo.toml index c9a5e37010..3f9bc39ba0 100644 --- a/linkerd/tonic-watch/Cargo.toml +++ b/linkerd/tonic-watch/Cargo.toml @@ -13,7 +13,7 @@ Provides a utility for creating robust watches from a service that returns a str futures = { version = "0.3", default-features = false } linkerd-error = { path = "../error" } linkerd-stack = { path = "../stack" } -tonic = { version = "0.5", default-features = false } +tonic = { version = "0.6", default-features = false } tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } tracing = "0.1" diff --git a/linkerd/transport-header/Cargo.toml b/linkerd/transport-header/Cargo.toml index 040ca8e13b..e20df04e7a 100644 --- a/linkerd/transport-header/Cargo.toml +++ b/linkerd/transport-header/Cargo.toml @@ -14,12 +14,12 @@ linkerd-dns-name = { path = "../dns/name" } linkerd-error = { path = "../error" } linkerd-io = { path = "../io" } linkerd-stack = { path = "../stack" } -prost = "0.8" +prost = "0.9" tokio = { version = "1", features = ["time"] } tracing = "0.1.29" [build-dependencies] -prost-build = { version = "0.8", default-features = false } +prost-build = { version = "0.9", default-features = false } [target.'cfg(fuzzing)'.dependencies] arbitrary = { version = "1", features = ["derive"] } diff --git a/opencensus-proto/Cargo.toml b/opencensus-proto/Cargo.toml index 27c03b03bc..8826083cb7 100644 --- a/opencensus-proto/Cargo.toml +++ b/opencensus-proto/Cargo.toml @@ -13,12 +13,12 @@ Vendored from https://github.com/census-instrumentation/opencensus-proto/. [dependencies] bytes = "1" -tonic = { version = "0.5", default-features = false, features = ["prost", "codegen"] } -prost = "0.8" -prost-types = "0.8" +tonic = { version = "0.6", default-features = false, features = ["prost", "codegen"] } +prost = "0.9" +prost-types = "0.9" [build-dependencies] -tonic-build = { version = "0.5", features = ["prost"], default-features = false } +tonic-build = { version = "0.6", features = ["prost"], default-features = false } [lib] doctest = false