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

factor observability things into its own module

Browse source 
And also create a new error for the observability initialization.
This commit is contained in:
Charles Hall 2024-05-23 13:39:40 -07:00
parent a275543494
commit c17ab5328d
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 81 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/main.rs
View file

@ -24,8 +24,6 @@ use http::{
header::{self, HeaderName},
Method, StatusCode, Uri,
};
use opentelemetry::KeyValue;
use opentelemetry_sdk::Resource;
use ruma::api::{
client::{
error::{Error as RumaError, ErrorBody, ErrorKind},
@ -41,13 +39,13 @@ use tower_http::{
ServiceBuilderExt as _,
};
use tracing::{debug, info, warn};
use tracing_subscriber::{prelude::*, EnvFilter};
pub(crate) mod api;
pub(crate) mod clap;
mod config;
mod database;
mod error;
mod observability;
mod service;
mod utils;
@ -127,48 +125,7 @@ async fn try_main() -> Result<(), error::Main> {
config.warn_deprecated();
if config.allow_jaeger {
opentelemetry::global::set_text_map_propagator(
opentelemetry_jaeger_propagator::Propagator::new(),
);
let tracer = opentelemetry_otlp::new_pipeline()
.tracing()
.with_trace_config(
opentelemetry_sdk::trace::config().with_resource(
Resource::new(vec![KeyValue::new(
"service.name",
env!("CARGO_PKG_NAME"),
)]),
),
)
.with_exporter(opentelemetry_otlp::new_exporter().tonic())
.install_batch(opentelemetry_sdk::runtime::Tokio)?;
let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
let filter_layer = EnvFilter::try_new(&config.log)?;
let subscriber = tracing_subscriber::Registry::default()
.with(filter_layer)
.with(telemetry);
tracing::subscriber::set_global_default(subscriber)?;
} else if config.tracing_flame {
let registry = tracing_subscriber::Registry::default();
let (flame_layer, _guard) =
tracing_flame::FlameLayer::with_file("./tracing.folded")?;
let flame_layer = flame_layer.with_empty_samples(false);
let filter_layer = EnvFilter::new("trace,h2=off");
let subscriber = registry.with(filter_layer).with(flame_layer);
tracing::subscriber::set_global_default(subscriber)?;
} else {
let registry = tracing_subscriber::Registry::default();
let fmt_layer = tracing_subscriber::fmt::Layer::new();
let filter_layer = EnvFilter::try_new(&config.log)?;
let subscriber = registry.with(filter_layer).with(fmt_layer);
tracing::subscriber::set_global_default(subscriber)?;
}
let _guard = observability::init(&config);
// This is needed for opening lots of file descriptors, which tends to
// happen more often when using RocksDB and making lots of federation
@ -185,15 +142,10 @@ async fn try_main() -> Result<(), error::Main> {
KeyValueDatabase::load_or_create(config)
.await
.map_err(Error::DatabaseError)?;
let config = &services().globals.config;
info!("Starting server");
run_server().await.map_err(Error::Serve)?;
if config.allow_jaeger {
opentelemetry::global::shutdown_tracer_provider();
}
Ok(())
}