From ed485c753f4d46b16de48a0b95210046ead09794 Mon Sep 17 00:00:00 2001
From: VendettaReborn <vendettareborn@proton.me>
Date: Mon, 20 May 2024 22:20:33 +0800
Subject: [PATCH] fix: fix NoHttpClient error in opentelemetry-otlp, use grpc
 instead

---
 Cargo.lock                   | 15 +--------------
 clash_lib/Cargo.toml         |  2 +-
 clash_lib/src/app/logging.rs |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d07c38112..1ed35caca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3498,18 +3498,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "opentelemetry-http"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cbfa5308166ca861434f0b0913569579b8e587430a3d6bcd7fd671921ec145a"
-dependencies = [
- "async-trait",
- "bytes",
- "http 0.2.12",
- "opentelemetry 0.22.0",
-]
-
 [[package]]
 name = "opentelemetry-http"
 version = "0.12.0"
@@ -3537,7 +3525,7 @@ dependencies = [
  "http 0.2.12",
  "hyper 0.14.28",
  "opentelemetry 0.23.0",
- "opentelemetry-http 0.12.0",
+ "opentelemetry-http",
  "opentelemetry-semantic-conventions 0.15.0",
  "opentelemetry_sdk 0.23.0",
  "thrift",
@@ -3563,7 +3551,6 @@ dependencies = [
  "futures-core",
  "http 0.2.12",
  "opentelemetry 0.22.0",
- "opentelemetry-http 0.11.0",
  "opentelemetry-proto",
  "opentelemetry-semantic-conventions 0.14.0",
  "opentelemetry_sdk 0.22.1",
diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml
index cfe568d48..0370b545c 100644
--- a/clash_lib/Cargo.toml
+++ b/clash_lib/Cargo.toml
@@ -45,7 +45,7 @@ opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"] }
 tracing-opentelemetry = "0.23"
 opentelemetry-jaeger-propagator = "0.1.0"
 opentelemetry-jaeger = { version = "0.22", features = ["collector_client", "hyper_collector_client", "rt-tokio"] }
-opentelemetry-otlp = { version = "0.15.0", features = ["http-proto"] }
+opentelemetry-otlp = { version = "0.15.0", features = ["grpc-tonic"] }
 
 crc32fast = "1.4.0"
 brotli = "6.0.0"
diff --git a/clash_lib/src/app/logging.rs b/clash_lib/src/app/logging.rs
index 752490c95..f47627b26 100644
--- a/clash_lib/src/app/logging.rs
+++ b/clash_lib/src/app/logging.rs
@@ -106,7 +106,7 @@ pub fn setup_logging(
         global::set_text_map_propagator(opentelemetry_jaeger_propagator::Propagator::new());
 
         let otlp_exporter = opentelemetry_otlp::new_exporter()
-            .http()
+            .tonic()
             .with_endpoint(jager_endpoint);
         let tracer =
             opentelemetry_otlp::new_pipeline()