From 83824a03ee0683c036628f57d7fbe956615814d9 Mon Sep 17 00:00:00 2001
From: Andy Lok <andylokandy@hotmail.com>
Date: Sat, 29 Jul 2023 11:53:24 +0800
Subject: [PATCH 1/2] fix(layer/minitrace): fix doctest

---
 Cargo.lock                   | 41 ++++++++++++++++++++++++++++++++++++
 core/Cargo.toml              |  2 ++
 core/src/layers/minitrace.rs |  4 ++--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 55743447e18b..b5f47382600a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2708,6 +2708,17 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "minitrace-jaeger"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d0fff56ac16fb4acb2f64e84f36879a2cacd87553c689ef2baec02a9097da6"
+dependencies = [
+ "log",
+ "minitrace",
+ "thrift_codec",
+]
+
 [[package]]
 name = "minitrace-macro"
 version = "0.5.0"
@@ -3140,6 +3151,7 @@ dependencies = [
  "metrics",
  "mini-moka",
  "minitrace",
+ "minitrace-jaeger",
  "moka",
  "once_cell",
  "openssh",
@@ -5240,6 +5252,16 @@ dependencies = [
  "threadpool",
 ]
 
+[[package]]
+name = "thrift_codec"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fce3200b189fd4733eb2bb22235755c8aa0361ba1c66b67db54893144d147279"
+dependencies = [
+ "byteorder",
+ "trackable",
+]
+
 [[package]]
 name = "tikv-client"
 version = "0.2.0"
@@ -5674,6 +5696,25 @@ dependencies = [
  "tracing-log",
 ]
 
+[[package]]
+name = "trackable"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15bd114abb99ef8cee977e517c8f37aee63f184f2d08e3e6ceca092373369ae"
+dependencies = [
+ "trackable_derive",
+]
+
+[[package]]
+name = "trackable_derive"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "triomphe"
 version = "0.1.8"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 33761cbdee1e..80bd9a1160d1 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -255,6 +255,8 @@ uuid = { version = "1", features = ["serde", "v4"] }
 criterion = { version = "0.4", features = ["async", "async_tokio"] }
 dotenvy = "0.15"
 libtest-mimic = "0.6"
+minitrace = { version = "0.5", features = ["enable"] }
+minitrace-jaeger = "0.5"
 opentelemetry = { version = "0.19", default-features = false, features = [
   "trace",
 ] }
diff --git a/core/src/layers/minitrace.rs b/core/src/layers/minitrace.rs
index a3d587317620..cf0fc74b1a42 100644
--- a/core/src/layers/minitrace.rs
+++ b/core/src/layers/minitrace.rs
@@ -75,7 +75,7 @@ use crate::*;
 ///         runtime.block_on(
 ///             async {
 ///                 let _ = dotenvy::dotenv();
-///                 let op = Operator::from_env::<services::Memory>()
+///                 let op = Operator::new(services::Memory::default())
 ///                     .expect("init operator must succeed")
 ///                     .layer(MinitraceLayer)
 ///                     .finish();
@@ -109,7 +109,7 @@ use crate::*;
 /// let reporter =
 ///     minitrace_jaeger::JaegerReporter::new("127.0.0.1:6831".parse().unwrap(), "opendal")
 ///         .unwrap();
-/// minitrace::set_reporter(reporter, Config::default());
+/// minitrace::set_reporter(reporter, minitrace::collector::Config::default());
 /// ```
 ///
 /// For real-world usage, please take a look at [`minitrace-datadog`](https://crates.io/crates/minitrace-datadog) or [`minitrace-jaeger`](https://crates.io/crates/minitrace-jaeger) .

From c1a94ebb47203df42eb341003c9a3f27ebdda2ff Mon Sep 17 00:00:00 2001
From: Andy Lok <andylokandy@hotmail.com>
Date: Sat, 29 Jul 2023 11:56:27 +0800
Subject: [PATCH 2/2] fix

---
 core/src/layers/minitrace.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/layers/minitrace.rs b/core/src/layers/minitrace.rs
index cf0fc74b1a42..6f574e7c1bfc 100644
--- a/core/src/layers/minitrace.rs
+++ b/core/src/layers/minitrace.rs
@@ -106,10 +106,12 @@ use crate::*;
 /// ```no_run
 /// extern crate minitrace_jaeger;
 ///
+/// use minitrace::collector::Config;
+///
 /// let reporter =
 ///     minitrace_jaeger::JaegerReporter::new("127.0.0.1:6831".parse().unwrap(), "opendal")
 ///         .unwrap();
-/// minitrace::set_reporter(reporter, minitrace::collector::Config::default());
+/// minitrace::set_reporter(reporter, Config::default());
 /// ```
 ///
 /// For real-world usage, please take a look at [`minitrace-datadog`](https://crates.io/crates/minitrace-datadog) or [`minitrace-jaeger`](https://crates.io/crates/minitrace-jaeger) .