Skip to content

Commit 4d2ce81

Browse files
authored
chore: use default OTLP config (#471)
* chore: use default OTLP config * fix service name * remove useless to_string
1 parent f024949 commit 4d2ce81

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/rollup-boost/src/tracing.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,21 +132,25 @@ pub fn init_tracing(args: &RollupBoostServiceArgs) -> eyre::Result<()> {
132132
.with_endpoint(&args.otlp_endpoint)
133133
.build()
134134
.context("Failed to create OTLP exporter")?;
135+
136+
// precedence: OTEL_SERVICE_NAME -> CARGO_PKG_NAME -> "rollup-boost"
137+
let service_name = std::env::var("OTEL_SERVICE_NAME")
138+
.ok()
139+
.or_else(|| std::env::var("CARGO_PKG_NAME").ok())
140+
.unwrap_or("rollup-boost".to_string());
141+
142+
let resource = Resource::builder()
143+
.with_attribute(KeyValue::new("service.name", service_name))
144+
.build();
145+
135146
let mut provider_builder = opentelemetry_sdk::trace::SdkTracerProvider::builder()
136147
.with_batch_exporter(otlp_exporter)
137-
.with_resource(
138-
Resource::builder_empty()
139-
.with_attributes([
140-
KeyValue::new("service.name", env!("CARGO_PKG_NAME")),
141-
KeyValue::new("service.version", env!("CARGO_PKG_VERSION")),
142-
])
143-
.build(),
144-
);
148+
.with_resource(resource);
145149
if args.metrics {
146150
provider_builder = provider_builder.with_span_processor(MetricsSpanProcessor);
147151
}
148152
let provider = provider_builder.build();
149-
let tracer = provider.tracer(env!("CARGO_PKG_NAME"));
153+
let tracer = provider.tracer("rollup-boost");
150154

151155
let trace_filter = Targets::new()
152156
.with_default(LevelFilter::OFF)

0 commit comments

Comments
 (0)