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

observability: allow combining multiple tracing layers

Browse source 
Previously, jaeger, tracing_flame and stderr output were mutually
exclusive. There's no good reason for this.
This commit is contained in:
Lambda 2024-05-23 18:53:54 +00:00 • committed by Charles Hall
parent 263edcc8a1
commit 7a154f7416
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/observability.rs
View file

@ -6,7 +6,7 @@ use std::{fs::File, io::BufWriter};
use opentelemetry::KeyValue; use opentelemetry::KeyValue;
use opentelemetry_sdk::Resource; use opentelemetry_sdk::Resource;
use tracing_flame::{FlameLayer, FlushGuard}; use tracing_flame::{FlameLayer, FlushGuard};
use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry}; use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Layer, Registry};
use crate::{config::Config, error, utils::error::Result}; use crate::{config::Config, error, utils::error::Result};
@ -25,8 +25,11 @@ impl Drop for Guard {
/// Initialize observability /// Initialize observability
pub(crate) fn init(config: &Config) -> Result<Guard, error::Observability> { pub(crate) fn init(config: &Config) -> Result<Guard, error::Observability> {
let mut flame_guard = None; let config_filter_layer = || EnvFilter::try_new(&config.log);
if config.allow_jaeger {
let jaeger_layer = config
.allow_jaeger
.then(|| {
opentelemetry::global::set_text_map_propagator( opentelemetry::global::set_text_map_propagator(
opentelemetry_jaeger_propagator::Propagator::new(), opentelemetry_jaeger_propagator::Propagator::new(),
); );
@ -44,28 +47,37 @@ pub(crate) fn init(config: &Config) -> Result<Guard, error::Observability> {
.install_batch(opentelemetry_sdk::runtime::Tokio)?; .install_batch(opentelemetry_sdk::runtime::Tokio)?;
let telemetry = tracing_opentelemetry::layer().with_tracer(tracer); let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
let filter_layer = EnvFilter::try_new(&config.log)?; Ok::<_, error::Observability>(
telemetry.with_filter(config_filter_layer()?),
)
})
.transpose()?;
let subscriber = Registry::default().with(filter_layer).with(telemetry); let (flame_layer, flame_guard) = config
tracing::subscriber::set_global_default(subscriber)?; .tracing_flame
} else if config.tracing_flame { .then(|| {
let registry = Registry::default(); let (flame_layer, guard) =
let (flame_layer, guard) = FlameLayer::with_file("./tracing.folded")?; FlameLayer::with_file("./tracing.folded")?;
flame_guard = Some(guard);
let flame_layer = flame_layer.with_empty_samples(false); let flame_layer = flame_layer.with_empty_samples(false);
let filter_layer = EnvFilter::new("trace,h2=off"); let filter_layer = EnvFilter::new("trace,h2=off");
let subscriber = registry.with(filter_layer).with(flame_layer); Ok::<_, error::Observability>((
tracing::subscriber::set_global_default(subscriber)?; flame_layer.with_filter(filter_layer),
} else { guard,
let registry = Registry::default(); ))
let fmt_layer = tracing_subscriber::fmt::Layer::new(); })
let filter_layer = EnvFilter::try_new(&config.log)?; .transpose()?
.unzip();
let subscriber = registry.with(filter_layer).with(fmt_layer); let fmt_layer = tracing_subscriber::fmt::Layer::new()
.with_filter(config_filter_layer()?);
let subscriber = Registry::default()
.with(jaeger_layer)
.with(flame_layer)
.with(fmt_layer);
tracing::subscriber::set_global_default(subscriber)?; tracing::subscriber::set_global_default(subscriber)?;
}
Ok(Guard { Ok(Guard {
flame_guard, flame_guard,