ZhenYi/gitdataai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(adminrpc): pass otel_enabled as defer arg to avoid double-init
Some checks are pending
CI / Rust Lint & Check (push) Waiting to run
Details
CI / Rust Tests (push) Waiting to run
Details
CI / Frontend Lint & Type Check (push) Waiting to run
Details
CI / Frontend Build (push) Blocked by required conditions
Details

Browse Source 
When OTLP is enabled, init_tracing_subscriber() must defer so that
init_otlp() is the sole caller of try_init(). Without this, the adminrpc
binary crashes with "global default trace dispatcher already set".
This commit is contained in:
ZhenYi 2026-04-22 23:47:15 +08:00
parent acd7fe8f6c
commit f125fb0c02
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/adminrpc/src/main.rs
View File

@ -15,7 +15,8 @@ use args::Args;
async fn main() -> anyhow::Result<()> { async fn main() -> anyhow::Result<()> {
let cfg = AppConfig::load(); let cfg = AppConfig::load();
let log_level = cfg.log_level().unwrap_or_else(|_| "info".to_string()); let log_level = cfg.log_level().unwrap_or_else(|_| "info".to_string());
observability::init_tracing_subscriber(&log_level, false); let otel_enabled = cfg.otel_enabled().unwrap_or(false);
observability::init_tracing_subscriber(&log_level, otel_enabled);
let args = Args::parse(); let args = Args::parse();
let grpc_addr: SocketAddr = args let grpc_addr: SocketAddr = args
@ -34,7 +35,7 @@ async fn main() -> anyhow::Result<()> {
"Starting admin RPC server" "Starting admin RPC server"
); );
let _otel_guard = if cfg.otel_enabled().unwrap_or(false) { let _otel_guard = if otel_enabled {
let endpoint = cfg let endpoint = cfg
.otel_endpoint() .otel_endpoint()
.unwrap_or_else(|_| "http://localhost:4317".to_string()); .unwrap_or_else(|_| "http://localhost:4317".to_string());