nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tracing

Browse Source
This commit is contained in:
Lennart
2025-04-13 20:13:28 +02:00
parent 64233f91d2
commit b2c1bd6b8d
3 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/setup_tracing.rs
View File

@@ -1,14 +1,14 @@
use crate::config::TracingConfig;
#[cfg(feature = "opentelemetry")]
use opentelemetry::{global, trace::TracerProvider, KeyValue};
use opentelemetry::{KeyValue, global, trace::TracerProvider};
#[cfg(feature = "opentelemetry")]
use opentelemetry_otlp::WithExportConfig;
#[cfg(feature = "opentelemetry")]
use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::Tracer, Resource};
use opentelemetry_sdk::{Resource, propagation::TraceContextPropagator, trace::Tracer};
#[cfg(feature = "opentelemetry")]
use opentelemetry_semantic_conventions::{
resource::{SERVICE_NAME, SERVICE_VERSION},
SCHEMA_URL,
resource::{SERVICE_NAME, SERVICE_VERSION},
};
#[cfg(feature = "opentelemetry")]
use std::time::Duration;
@@ -17,9 +17,9 @@ use tracing::level_filters::LevelFilter;
use tracing::warn;
#[cfg(feature = "opentelemetry")]
use tracing_opentelemetry::OpenTelemetryLayer;
use tracing_subscriber::EnvFilter;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::util::SubscriberInitExt;
use tracing_subscriber::EnvFilter;
#[cfg(feature = "opentelemetry")]
pub fn init_otel() -> Tracer {
@@ -29,15 +29,19 @@ pub fn init_otel() -> Tracer {
.build()
.unwrap();
let tracer_provider = opentelemetry_sdk::trace::TracerProvider::builder()
.with_batch_exporter(otel_exporter, opentelemetry_sdk::runtime::Tokio)
.with_resource(Resource::from_schema_url(
[
KeyValue::new(SERVICE_NAME, env!("CARGO_PKG_NAME")),
KeyValue::new(SERVICE_VERSION, env!("CARGO_PKG_VERSION")),
],
SCHEMA_URL,
))
let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
.with_batch_exporter(otel_exporter)
.with_resource(
Resource::builder_empty()
.with_schema_url(
[
KeyValue::new(SERVICE_NAME, env!("CARGO_PKG_NAME")),
KeyValue::new(SERVICE_VERSION, env!("CARGO_PKG_VERSION")),
],
SCHEMA_URL,
)
.build(),
)
.build();
global::set_tracer_provider(tracer_provider.clone());
@@ -66,7 +70,9 @@ pub fn setup_tracing(config: &TracingConfig) {
#[cfg(not(feature = "opentelemetry"))]
{
registry.init();
warn!("This version of RustiCal is compiled without the opentelemetry feature. tracing.opentelemtry = true has no effect");
warn!(
"This version of RustiCal is compiled without the opentelemetry feature. tracing.opentelemtry = true has no effect"
);
}
} else {
registry.init();