Skip to content

Commit 64b11e0

Browse files
authored
fix: don't return empty string when trace header is not present (#1523)
1 parent 3f327a1 commit 64b11e0

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

opentelemetry-sdk/src/propagation/trace_context.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,12 @@ impl TraceContextPropagator {
9797
// supported sampling bit.
9898
let trace_flags = TraceFlags::new(opts) & TraceFlags::SAMPLED;
9999

100-
let trace_state: TraceState =
101-
TraceState::from_str(extractor.get(TRACESTATE_HEADER).unwrap_or(""))
102-
.unwrap_or_else(|_| TraceState::default());
100+
let trace_state = match extractor.get(TRACESTATE_HEADER) {
101+
Some(trace_state_str) => {
102+
TraceState::from_str(trace_state_str).unwrap_or_else(|_| TraceState::default())
103+
}
104+
None => TraceState::default(),
105+
};
103106

104107
// create context
105108
let span_context = SpanContext::new(trace_id, span_id, trace_flags, true, trace_state);

0 commit comments

Comments
 (0)