From b3e77db03a528cb05a0d8c3104a4063d2b3a30e3 Mon Sep 17 00:00:00 2001
From: aumetra <aumetra@cryptolab.net>
Date: Sun, 22 Oct 2023 01:03:56 +0200
Subject: [PATCH] remove few dependencies

---
 Cargo.lock | 70 +++++++++++++++---------------------------------------
 Cargo.toml |  6 +++++
 2 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a3bc3915..05341794c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2486,18 +2486,6 @@ dependencies = [
  "tokio-rustls",
 ]
 
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.58"
@@ -3093,7 +3081,7 @@ dependencies = [
  "metrics-opentelemetry",
  "metrics-tracing-context",
  "metrics-util",
- "opentelemetry",
+ "opentelemetry 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "opentelemetry-http",
  "opentelemetry-otlp",
  "tracing",
@@ -3963,11 +3951,19 @@ dependencies = [
  "opentelemetry_sdk",
 ]
 
+[[package]]
+name = "opentelemetry"
+version = "0.20.0"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44#41e8d63652b323866c03981b4b2ca62b9b8d6d44"
+dependencies = [
+ "opentelemetry_api",
+ "opentelemetry_sdk",
+]
+
 [[package]]
 name = "opentelemetry-http"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44#41e8d63652b323866c03981b4b2ca62b9b8d6d44"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3978,8 +3974,7 @@ dependencies = [
 [[package]]
 name = "opentelemetry-otlp"
 version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44#41e8d63652b323866c03981b4b2ca62b9b8d6d44"
 dependencies = [
  "async-trait",
  "futures-core",
@@ -3991,15 +3986,12 @@ dependencies = [
  "opentelemetry_sdk",
  "prost",
  "thiserror",
- "tokio",
- "tonic",
 ]
 
 [[package]]
 name = "opentelemetry-proto"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44#41e8d63652b323866c03981b4b2ca62b9b8d6d44"
 dependencies = [
  "opentelemetry_api",
  "opentelemetry_sdk",
@@ -4010,21 +4002,19 @@ dependencies = [
 [[package]]
 name = "opentelemetry-semantic-conventions"
 version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44#41e8d63652b323866c03981b4b2ca62b9b8d6d44"
 dependencies = [
- "opentelemetry",
+ "opentelemetry 0.20.0 (git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44)",
 ]
 
 [[package]]
 name = "opentelemetry_api"
 version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44#41e8d63652b323866c03981b4b2ca62b9b8d6d44"
 dependencies = [
  "futures-channel",
  "futures-util",
- "indexmap 1.9.3",
+ "indexmap 2.0.2",
  "js-sys",
  "once_cell",
  "pin-project-lite",
@@ -4035,8 +4025,7 @@ dependencies = [
 [[package]]
 name = "opentelemetry_sdk"
 version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust.git?rev=41e8d63652b323866c03981b4b2ca62b9b8d6d44#41e8d63652b323866c03981b4b2ca62b9b8d6d44"
 dependencies = [
  "async-trait",
  "crossbeam-channel",
@@ -4049,7 +4038,6 @@ dependencies = [
  "percent-encoding",
  "rand",
  "regex",
- "serde_json",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -5872,16 +5860,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "2.1.0"
@@ -6045,22 +6023,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
 dependencies = [
  "async-trait",
- "axum",
  "base64 0.21.4",
  "bytes",
  "futures-core",
  "futures-util",
- "h2",
  "http",
  "http-body",
- "hyper",
- "hyper-timeout",
  "percent-encoding",
  "pin-project",
  "prost",
- "tokio",
  "tokio-stream",
- "tower",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -6074,13 +6046,9 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
- "rand",
- "slab",
  "tokio",
- "tokio-util",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -6199,7 +6167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8"
 dependencies = [
  "once_cell",
- "opentelemetry",
+ "opentelemetry 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "opentelemetry_sdk",
  "tracing",
  "tracing-core",
diff --git a/Cargo.toml b/Cargo.toml
index 3da7836d6..63a1d4a2e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,4 +43,10 @@ edition = "2021"
 version = "0.0.1-pre.3"
 
 [patch.crates-io]
+# Patch the opentelemetry crate versions to get rid of a few tonic dependencies
+opentelemetry_api = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "41e8d63652b323866c03981b4b2ca62b9b8d6d44" }
+opentelemetry-http = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "41e8d63652b323866c03981b4b2ca62b9b8d6d44" }
+opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "41e8d63652b323866c03981b4b2ca62b9b8d6d44" }
+opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "41e8d63652b323866c03981b4b2ca62b9b8d6d44" }
+
 redis = { git = "https://github.com/aumetra/redis-rs.git", rev = "3c4ee09d432a69e1d87d66dcba14c519467c9b81" }