backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make tracing filters configurable per backend

Browse source
This commit is contained in:
Lambda 2024-06-07 10:14:05 +00:00 • committed by Charles Hall
parent 98d49554ce
commit df571818f1
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
2 changed files with 77 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/config.rs
View file

@ -14,7 +14,7 @@ use crate::error;
mod env_filter_clone;
mod proxy;
use env_filter_clone::EnvFilterClone;
pub(crate) use env_filter_clone::EnvFilterClone;
use proxy::ProxyConfig;
/// The default configuration file path
@ -180,16 +180,36 @@ pub(crate) struct MetricsConfig {
pub(crate) enable: bool,
}
#[derive(Clone, Debug, Default, Deserialize)]
#[derive(Debug, Deserialize)]
#[serde(default)]
pub(crate) struct OtelTraceConfig {
pub(crate) enable: bool,
pub(crate) filter: EnvFilterClone,
}
#[derive(Clone, Debug, Default, Deserialize)]
impl Default for OtelTraceConfig {
fn default() -> Self {
Self {
enable: false,
filter: default_tracing_filter(),
}
}
}
#[derive(Debug, Deserialize)]
#[serde(default)]
pub(crate) struct FlameConfig {
pub(crate) enable: bool,
pub(crate) filter: EnvFilterClone,
}
impl Default for FlameConfig {
fn default() -> Self {
Self {
enable: false,
filter: default_tracing_filter(),
}
}
}
#[derive(Debug, Deserialize)]
@ -203,7 +223,7 @@ pub(crate) struct LogConfig {
impl Default for LogConfig {
fn default() -> Self {
Self {
filter: default_log(),
filter: default_tracing_filter(),
colors: true,
format: LogFormat::default(),
}
@ -286,7 +306,7 @@ fn default_trusted_servers() -> Vec<OwnedServerName> {
vec![OwnedServerName::try_from("matrix.org").unwrap()]
}
fn default_log() -> EnvFilterClone {
fn default_tracing_filter() -> EnvFilterClone {
"info,ruma_state_res=warn"
.parse()
.expect("hardcoded env filter should be valid")