Skip to content

Commit 65fa0c7

Browse files
committed
conflcits
1 parent 5bde5c6 commit 65fa0c7

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • bottlecap/src/traces/propagation

bottlecap/src/traces/propagation/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ pub fn extract_composite(
2323
if config.trace_propagation_extract_first {
2424
for propagation_style in &config.trace_propagation_style_extract {
2525
let context = propagation_style.extract(carrier);
26-
if let Some(mut context) = context {
27-
if self.config.trace_propagation_http_baggage_enabled {
28-
Self::attach_baggage(&mut context, carrier);
29-
}
30-
return Some(context);
26+
if let Some(mut context) = context {
27+
if config.trace_propagation_http_baggage_enabled {
28+
attach_baggage(&mut context, carrier);
3129
}
30+
return Some(context);
3231
}
3332
}
33+
}
3434

3535
let contexts_found = extract_available_contexts(config, carrier);
3636
if let Some(mut primary_context) = resolve_primary_context_with_links(contexts_found) {

0 commit comments

Comments
 (0)