From ec4816bd009cd91e19bfb0e7ea3b376d72553040 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sun, 6 Feb 2022 15:16:23 -0500
Subject: [PATCH] Upgrade vendored newrelic-telemetry-sdk tokio 0.2 -> 1.0

---
 Cargo.lock                                    | 46 ++-----------------
 vendor/newrelic-telemetry-sdk-rust/Cargo.toml |  8 ++--
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b714f103..da8c41e03 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1931,19 +1931,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
-dependencies = [
- "bytes 0.5.6",
- "hyper 0.13.10",
- "native-tls",
- "tokio 0.2.25",
- "tokio-tls",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -2464,13 +2451,13 @@ dependencies = [
  "env_logger",
  "flate2",
  "futures 0.3.17",
- "hyper 0.13.10",
- "hyper-tls 0.4.3",
+ "hyper 0.14.14",
+ "hyper-tls",
  "log",
  "rand 0.7.3",
  "serde",
  "serde_json",
- "tokio 0.2.25",
+ "tokio 1.13.0",
  "uuid",
 ]
 
@@ -3155,7 +3142,7 @@ dependencies = [
  "http",
  "http-body 0.4.4",
  "hyper 0.14.14",
- "hyper-tls 0.5.0",
+ "hyper-tls",
  "ipnet",
  "js-sys",
  "lazy_static",
@@ -4037,11 +4024,9 @@ dependencies = [
  "memchr",
  "mio 0.6.23",
  "mio-uds",
- "num_cpus",
  "pin-project-lite 0.1.12",
  "signal-hook-registry",
  "slab",
- "tokio-macros 0.2.6",
  "winapi 0.3.9",
 ]
 
@@ -4061,7 +4046,7 @@ dependencies = [
  "parking_lot 0.11.1",
  "pin-project-lite 0.2.6",
  "signal-hook-registry",
- "tokio-macros 1.5.1",
+ "tokio-macros",
  "winapi 0.3.9",
 ]
 
@@ -4097,17 +4082,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "1.5.1"
@@ -4194,16 +4168,6 @@ dependencies = [
  "tokio-reactor",
 ]
 
-[[package]]
-name = "tokio-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
-dependencies = [
- "native-tls",
- "tokio 0.2.25",
-]
-
 [[package]]
 name = "tokio-tungstenite"
 version = "0.15.0"
diff --git a/vendor/newrelic-telemetry-sdk-rust/Cargo.toml b/vendor/newrelic-telemetry-sdk-rust/Cargo.toml
index 0434c20be..b11c42a81 100644
--- a/vendor/newrelic-telemetry-sdk-rust/Cargo.toml
+++ b/vendor/newrelic-telemetry-sdk-rust/Cargo.toml
@@ -15,15 +15,15 @@ log = "0.4"
 serde = { version = "1.0.57", features = ["derive"] }
 serde_json = "1.0.57"
 
-hyper = { version = "0.13", features = [], optional = true }
-hyper-tls = { version = "0.4.0", optional = true }
+hyper = { version = "0.14", features = [], optional = true }
+hyper-tls = { version = "0.5.0", optional = true }
 flate2 = { version = "1.0.16", optional = true }
 futures = { version = "0.3.1", optional = true }
-tokio = { version = "0.2.6", features = ["rt-threaded", "macros"], optional = true }
+tokio = { version = "1.1.0", features = ["macros"], optional = true }
 uuid = { version = "0.8.1", features = ["v4"] }
 
 [dev-dependencies]
 rand = "0.7.3"
 env_logger = "0.7.1"
 futures = { version = "0.3.1" }
-tokio = { version = "0.2.6", features = ["rt-threaded", "macros"] }
+tokio = { version = "1.1.0", features = ["macros"] }