zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-08 22:07:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow tracing level to be customized

Browse Source
This commit is contained in:
Nathan Sobo 2022-04-27 15:26:54 -06:00
parent 6a21a0f6b8
commit 2db670308b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/collab/src/main.rs
View File

@ -11,6 +11,7 @@ use std::{
net::{SocketAddr, TcpListener}, net::{SocketAddr, TcpListener},
sync::Arc, sync::Arc,
}; };
use tracing::metadata::LevelFilter;
#[derive(Default, Deserialize)] #[derive(Default, Deserialize)]
pub struct Config { pub struct Config {
@ -19,6 +20,7 @@ pub struct Config {
pub api_token: String, pub api_token: String,
pub honeycomb_api_key: Option<String>, pub honeycomb_api_key: Option<String>,
pub honeycomb_dataset: Option<String>, pub honeycomb_dataset: Option<String>,
pub trace_level: Option<String>,
} }
pub struct AppState { pub struct AppState {
@ -56,12 +58,6 @@ async fn main() -> Result<()> {
init_tracing(&config); init_tracing(&config);
let state = AppState::new(&config).await?; let state = AppState::new(&config).await?;
{
let root = tracing::span!(tracing::Level::TRACE, "testing_1", work_units = 2_i32);
let _enter = root.enter();
tracing::error!("test_error_1");
}
let listener = TcpListener::bind(&format!("0.0.0.0:{}", config.http_port)) let listener = TcpListener::bind(&format!("0.0.0.0:{}", config.http_port))
.expect("failed to bind TCP listener"); .expect("failed to bind TCP listener");
@ -124,6 +120,7 @@ impl std::fmt::Display for Error {
pub fn init_tracing(config: &Config) -> Option<()> { pub fn init_tracing(config: &Config) -> Option<()> {
use opentelemetry::KeyValue; use opentelemetry::KeyValue;
use opentelemetry_otlp::WithExportConfig; use opentelemetry_otlp::WithExportConfig;
use std::str::FromStr;
use tracing_opentelemetry::OpenTelemetryLayer; use tracing_opentelemetry::OpenTelemetryLayer;
use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::layer::SubscriberExt;
@ -153,7 +150,15 @@ pub fn init_tracing(config: &Config) -> Option<()> {
let subscriber = tracing_subscriber::Registry::default() let subscriber = tracing_subscriber::Registry::default()
.with(OpenTelemetryLayer::new(tracer)) .with(OpenTelemetryLayer::new(tracer))
.with(tracing_subscriber::fmt::layer()); .with(tracing_subscriber::fmt::layer())
.with(
config
.trace_level
.as_ref()
.map_or(LevelFilter::INFO, |level| {
LevelFilter::from_str(level).unwrap()
}),
);
tracing::subscriber::set_global_default(subscriber).unwrap(); tracing::subscriber::set_global_default(subscriber).unwrap();