fix madsim

Signed-off-by: Bugen Zhao <[email protected]>
risingwavelabs · Jun 16, 2023 · abbcf2a · abbcf2a
1 parent c0c3538
commit abbcf2a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/utils/runtime/Cargo.toml b/src/utils/runtime/Cargo.toml
@@ -20,7 +20,6 @@ console = "0.15"
 console-subscriber = "0.1.8"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 hostname = "0.3"
-opentelemetry = { version = "0.19", default-features = false, features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.12" }
 opentelemetry-semantic-conventions = "0.11"
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }
@@ -41,4 +40,5 @@ tracing-opentelemetry = "0.19"
 tracing-subscriber = { version = "0.3", features = ["fmt", "parking_lot", "std", "time", "local-time"] }
 
 [target.'cfg(not(madsim))'.dependencies]
+opentelemetry = { version = "0.19", default-features = false, features = ["rt-tokio"] }
 workspace-hack = { path = "../../workspace-hack" }
diff --git a/src/utils/runtime/src/lib.rs b/src/utils/runtime/src/lib.rs
@@ -21,7 +21,6 @@ use std::path::PathBuf;
 use std::time::Duration;
 
 use futures::Future;
-use opentelemetry_otlp::WithExportConfig;
 use risingwave_common::metrics::MetricsLayer;
 use tracing::level_filters::LevelFilter as Level;
 use tracing_subscriber::filter::{Directive, Targets};
@@ -301,10 +300,12 @@ pub fn init_risingwave_logger(settings: LoggerSettings, registry: prometheus::Re
     };
 
     // Tracing layer
+    #[cfg(not(madsim))]
     if let Ok(endpoint) = std::env::var("RW_TRACING_ENDPOINT") {
         println!("tracing enabled, exported to `{endpoint}`");
 
         use opentelemetry::{sdk, KeyValue};
+        use opentelemetry_otlp::WithExportConfig;
         use opentelemetry_semantic_conventions::resource;
 
         let id = format!(

diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
@@ -63,8 +63,6 @@ num = { version = "0.4" }
 num-bigint = { version = "0.4" }
 num-integer = { version = "0.1", features = ["i128"] }
 num-traits = { version = "0.2", features = ["i128", "libm"] }
-opentelemetry = { version = "0.19", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
-opentelemetry_sdk = { version = "0.19", features = ["metrics", "rt-tokio"] }
 parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] }
 parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] }
 petgraph = { version = "0.6" }
@@ -150,8 +148,6 @@ num = { version = "0.4" }
 num-bigint = { version = "0.4" }
 num-integer = { version = "0.1", features = ["i128"] }
 num-traits = { version = "0.2", features = ["i128", "libm"] }
-opentelemetry = { version = "0.19", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
-opentelemetry_sdk = { version = "0.19", features = ["metrics", "rt-tokio"] }
 parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] }
 parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] }
 petgraph = { version = "0.6" }