From 8eb0c5a8a26c5b563d4b43c8aa2276c822dd9b6d Mon Sep 17 00:00:00 2001
From: "Brian L. Troutwine" <brian.troutwine@datadoghq.com>
Date: Mon, 11 Nov 2024 17:24:22 -0800
Subject: [PATCH] Upgrade tower to 0.5, use workspace dependency

Signed-off-by: Brian L. Troutwine <brian.troutwine@datadoghq.com>
---
 Cargo.lock                      | 29 +++++++++++++++++++++++------
 Cargo.toml                      |  1 +
 integration/ducks/Cargo.toml    |  2 +-
 integration/sheepdog/Cargo.toml |  3 ++-
 lading/Cargo.toml               |  3 ++-
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 78c548af7..fc4c0333b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -211,7 +211,7 @@ dependencies = [
  "rustversion",
  "serde",
  "sync_wrapper 0.1.2",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
 ]
@@ -701,7 +701,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tonic 0.9.2",
- "tower",
+ "tower 0.5.1",
  "tracing",
  "tracing-subscriber",
 ]
@@ -1468,7 +1468,7 @@ dependencies = [
  "tokio-stream",
  "tokio-util",
  "tonic 0.9.2",
- "tower",
+ "tower 0.5.1",
  "tracing",
  "tracing-subscriber",
  "uuid",
@@ -2668,7 +2668,7 @@ dependencies = [
  "tempfile",
  "tokio",
  "tonic 0.9.2",
- "tower",
+ "tower 0.5.1",
  "tracing",
  "tracing-subscriber",
 ]
@@ -2988,7 +2988,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -3017,7 +3017,7 @@ dependencies = [
  "prost",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -3069,6 +3069,23 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 0.1.2",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
diff --git a/Cargo.toml b/Cargo.toml
index c3294e6a7..502604ad0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,7 @@ serde = { version = "1.0", features = ["std", "derive"] }
 serde_json = { version = "1.0", features = ["std"] }
 thiserror = { version = "1.0" }
 tokio = { version = "1.41" }
+tower = { version = "0.5", default-features = false }
 tracing = { version = "0.1" }
 uuid = { version = "1.11", default-features = false, features = [
   "v4",
diff --git a/integration/ducks/Cargo.toml b/integration/ducks/Cargo.toml
index 0ac552e66..4f0f3c26f 100644
--- a/integration/ducks/Cargo.toml
+++ b/integration/ducks/Cargo.toml
@@ -30,7 +30,7 @@ tonic = { version = "0.9", default-features = false, features = [
   "transport",
   "prost",
 ] }
-tower = { version = "0.4", default-features = false, features = [
+tower = { workspace = true, default-features = false, features = [
   "timeout",
   "limit",
   "load-shed",
diff --git a/integration/sheepdog/Cargo.toml b/integration/sheepdog/Cargo.toml
index e3bc67f60..439ea4904 100644
--- a/integration/sheepdog/Cargo.toml
+++ b/integration/sheepdog/Cargo.toml
@@ -26,10 +26,11 @@ tonic = { version = "0.9", default-features = false, features = [
   "transport",
   "prost",
 ] }
-tower = { version = "0.4", default-features = false, features = [
+tower = { workspace = true, features = [
   "timeout",
   "limit",
   "load-shed",
+  "util",
 ] }
 tracing = { version = "0.1", features = ["std", "attributes"] }
 tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] }
diff --git a/lading/Cargo.toml b/lading/Cargo.toml
index 662364e3a..ad72e5d32 100644
--- a/lading/Cargo.toml
+++ b/lading/Cargo.toml
@@ -75,10 +75,11 @@ tokio = { workspace = true, features = [
 tokio-stream = { version = "0.1", features = ["io-util"] }
 tokio-util = { version = "0.7", features = ["io"] }
 tonic = { version = "0.9" }
-tower = { version = "0.4", default-features = false, features = [
+tower = { workspace = true, features = [
   "timeout",
   "limit",
   "load-shed",
+  "util",
 ] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] }