From 48af1eef6352bd35c607267d68b24cf16033beeb Mon Sep 17 00:00:00 2001
From: Eliza Weisman <eliza@buoyant.io>
Date: Tue, 9 May 2023 09:49:44 -0700
Subject: [PATCH] feat: update `tonic` to 0.9 (#420)

This commit updates the `console-subscriber` and `tokio-console` crates'
`tonic` dependencies to 0.9. This is not a breaking change to these
crates.
---
 Cargo.lock                    | 70 ++---------------------------------
 console-subscriber/Cargo.toml |  2 +-
 tokio-console/Cargo.toml      |  2 +-
 3 files changed, 5 insertions(+), 69 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba1dbca64..1356560c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,28 +41,6 @@ version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
 
-[[package]]
-name = "async-stream"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.68"
@@ -282,7 +260,7 @@ dependencies = [
  "prost",
  "prost-build",
  "prost-types",
- "tonic 0.9.2",
+ "tonic",
  "tonic-build",
  "tracing-core",
 ]
@@ -304,7 +282,7 @@ dependencies = [
  "thread_local",
  "tokio",
  "tokio-stream",
- "tonic 0.8.3",
+ "tonic",
  "tracing",
  "tracing-core",
  "tracing-subscriber",
@@ -1474,7 +1452,7 @@ dependencies = [
  "serde",
  "tokio",
  "toml",
- "tonic 0.8.3",
+ "tonic",
  "tower",
  "tracing",
  "tracing-journald",
@@ -1537,38 +1515,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "tonic"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum",
- "base64 0.13.0",
- "bytes",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost",
- "prost-derive",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
- "tracing-futures",
-]
-
 [[package]]
 name = "tonic"
 version = "0.9.2"
@@ -1686,16 +1632,6 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
 [[package]]
 name = "tracing-journald"
 version = "0.2.4"
diff --git a/console-subscriber/Cargo.toml b/console-subscriber/Cargo.toml
index 3c044c8d7..f3cfc19e2 100644
--- a/console-subscriber/Cargo.toml
+++ b/console-subscriber/Cargo.toml
@@ -36,7 +36,7 @@ tokio = { version = "^1.21", features = ["sync", "time", "macros", "tracing"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 thread_local = "1.1.3"
 console-api = { version = "0.4.0", path = "../console-api", features = ["transport"] }
-tonic = { version = "0.8", features = ["transport"] }
+tonic = { version = "0.9", features = ["transport"] }
 tracing-core = "0.1.24"
 tracing = "0.1.26"
 tracing-subscriber = { version = "0.3.11", default-features = false, features = ["fmt", "registry"] }
diff --git a/tokio-console/Cargo.toml b/tokio-console/Cargo.toml
index a6f0de3f3..d1f120131 100644
--- a/tokio-console/Cargo.toml
+++ b/tokio-console/Cargo.toml
@@ -31,7 +31,7 @@ atty = "0.2"
 console-api = { version = "0.4.0", path = "../console-api", features = ["transport"] }
 clap = { version = "3", features = ["cargo", "derive", "env"] }
 tokio = { version = "1", features = ["full", "rt-multi-thread"] }
-tonic = { version = "0.8", features = ["transport"] }
+tonic = { version = "0.9", features = ["transport"] }
 futures = "0.3"
 tui = { version = "0.16.0", default-features = false, features = ["crossterm"] }
 tower = "0.4.12"