Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tracing): Only override the OTEL service name if it is not already set #224

Merged
merged 5 commits into from
Feb 8, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/kwaak_tracing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ use opentelemetry_sdk::trace::TracerProvider;

#[cfg(feature = "otel")]
fn init_otel() -> TracerProvider {
use std::collections::HashMap;

use opentelemetry_sdk::runtime;
use opentelemetry_sdk::trace::TracerProvider;

Expand All @@ -101,10 +103,27 @@ fn init_otel() -> TracerProvider {
.build()
.expect("failed to create otlp exporter");

let service_name = if let Ok(service_name) = std::env::var("OTEL_SERVICE_NAME") {
service_name
} else {
let resource_attributes = std::env::var("OTEL_RESOURCE_ATTRIBUTES")
.unwrap_or_default()
.split(',')
.filter(|s| !s.is_empty())
.map(|s| s.split_once('=').expect("invalid OTEL_RESOURCE_ATTRIBUTES"))
.map(|(key, value)| (key.to_string(), value.to_string()))
.collect::<HashMap<String, String>>();
if let Some(service_name) = resource_attributes.get("service.name") {
service_name.to_string()
} else {
"kwaak".to_string()
}
};

TracerProvider::builder()
.with_batch_exporter(exporter, runtime::Tokio)
.with_resource(opentelemetry_sdk::Resource::new(vec![
opentelemetry::KeyValue::new("service.name", "kwaak"),
opentelemetry::KeyValue::new("service.name", service_name),
]))
.build()
}