From 36c4a373ebcd50fd26509c505d01dfca438061c7 Mon Sep 17 00:00:00 2001
From: smorihira <mos.aif.0924@gmail.com>
Date: Fri, 13 Sep 2024 17:28:43 +0900
Subject: [PATCH] fix: downgrade otel to 2.23.0

---
 rust/Cargo.lock                 | 41 +++++++++++++++++----------------
 rust/bin/meta/Cargo.toml        |  2 +-
 rust/bin/meta/src/main.rs       |  2 +-
 rust/bin/test_client/Cargo.toml |  2 +-
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 4b1b50f0e86..0f34258849b 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -780,7 +780,7 @@ dependencies = [
  "defer",
  "kv",
  "observability",
- "opentelemetry 0.25.0",
+ "opentelemetry",
  "prost-types",
  "proto",
  "sled",
@@ -838,7 +838,7 @@ name = "observability"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "opentelemetry 0.23.0",
+ "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry-semantic-conventions",
  "opentelemetry_sdk",
@@ -869,20 +869,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "opentelemetry"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803801d3d3b71cd026851a53f974ea03df3d179cb758b260136a6c9e22e196af"
-dependencies = [
- "futures-core",
- "futures-sink",
- "js-sys",
- "once_cell",
- "pin-project-lite",
- "thiserror",
-]
-
 [[package]]
 name = "opentelemetry-http"
 version = "0.12.0"
@@ -892,7 +878,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "http 0.2.12",
- "opentelemetry 0.23.0",
+ "opentelemetry",
  "reqwest",
 ]
 
@@ -905,7 +891,7 @@ dependencies = [
  "async-trait",
  "futures-core",
  "http 0.2.12",
- "opentelemetry 0.23.0",
+ "opentelemetry",
  "opentelemetry-http",
  "opentelemetry-proto",
  "opentelemetry_sdk",
@@ -922,7 +908,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162"
 dependencies = [
- "opentelemetry 0.23.0",
+ "opentelemetry",
  "opentelemetry_sdk",
  "prost 0.12.6",
  "tonic 0.11.0",
@@ -947,7 +933,7 @@ dependencies = [
  "glob",
  "lazy_static",
  "once_cell",
- "opentelemetry 0.23.0",
+ "opentelemetry",
  "ordered-float",
  "percent-encoding",
  "rand",
@@ -1403,6 +1389,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "test_client"
+version = "0.1.0"
+dependencies = [
+ "defer",
+ "kv",
+ "observability",
+ "opentelemetry",
+ "prost-types",
+ "proto",
+ "sled",
+ "tokio",
+ "tonic 0.12.2",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.63"
diff --git a/rust/bin/meta/Cargo.toml b/rust/bin/meta/Cargo.toml
index 9dda1a93686..b338449a466 100644
--- a/rust/bin/meta/Cargo.toml
+++ b/rust/bin/meta/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 kv = "0.24.0"
-opentelemetry = "0.25.0"
+opentelemetry = "0.23.0"
 prost-types = "0.13.2"
 proto = { version = "0.1.0", path = "../../libs/proto" }
 sled = "0.34.7"
diff --git a/rust/bin/meta/src/main.rs b/rust/bin/meta/src/main.rs
index 43efc37b0e2..626ecac09a3 100644
--- a/rust/bin/meta/src/main.rs
+++ b/rust/bin/meta/src/main.rs
@@ -74,7 +74,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .attribute("target_node", "target_node")
         .attribute("exported_kubernetes_namaspace", "default")
         .attribute("kubernetes_name", "vald-lb-gateway")
-        .endpoint("http://127.0.0.1:4318")
+        .endpoint("http://127.0.0.1:4317")
         .tracer(Tracer::new().enabled(true));
     let mut observability = ObservabilityImpl::new(observability_cfg)?;
 
diff --git a/rust/bin/test_client/Cargo.toml b/rust/bin/test_client/Cargo.toml
index 1f0b23ed9b9..ed2470fb236 100644
--- a/rust/bin/test_client/Cargo.toml
+++ b/rust/bin/test_client/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 kv = "0.24.0"
-opentelemetry = "0.25.0"
+opentelemetry = "0.23.0"
 prost-types = "0.13.2"
 proto = { version = "0.1.0", path = "../../libs/proto" }
 sled = "0.34.7"