Skip to content

Global error handler cleanup - baggage propagator #2251

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.

Sign up for GitHub

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

Merged
cijothomas merged 5 commits into from
Oct 27, 2024
Merged

Global error handler cleanup - baggage propagator #2251

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ddba91
remove propagator error
lalitb Oct 25, 2024
de933f9
use otel_warn
lalitb Oct 26, 2024
0f126be
Merge branch 'main' into baggaga-internal-log
lalitb Oct 26, 2024
f83c1dd
bring back PropagationError, will cleanup separately
lalitb Oct 26, 2024
1fce86f
Merge branch 'main' into baggaga-internal-log
cijothomas Oct 26, 2024
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
29 changes: 15 additions & 14 deletions opentelemetry-sdk/src/propagation/baggage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use once_cell::sync::Lazy;
use opentelemetry::propagation::PropagationError;
use opentelemetry::{
baggage::{BaggageExt, KeyValueMetadata},
global,
otel_warn,
propagation::{text_map_propagator::FieldIter, Extractor, Injector, TextMapPropagator},
Context,
};
Expand Down Expand Up @@ -120,24 +119,26 @@
decoded_props.as_str(),
))
} else {
global::handle_error(PropagationError::extract(
"invalid UTF8 string in key values",
"BaggagePropagator",
));
otel_warn!(

Check warning on line 122 in opentelemetry-sdk/src/propagation/baggage.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/propagation/baggage.rs#L122 

Added line #L122 was not covered by tests
name: "BaggagePropagator.Extract.InvalidUTF8",
message = "Invalid UTF8 string in key values",
baggage_header = header_value,

Check warning on line 125 in opentelemetry-sdk/src/propagation/baggage.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/propagation/baggage.rs#L125 

Added line #L125 was not covered by tests
);
None
}
} else {
global::handle_error(PropagationError::extract(
"invalid baggage key-value format",
"BaggagePropagator",
));
otel_warn!(
name: "BaggagePropagator.Extract.InvalidKeyValueFormat",
message = "Invalid baggage key-value format",
baggage_header = header_value,

Check warning on line 133 in opentelemetry-sdk/src/propagation/baggage.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/propagation/baggage.rs#L133 

Added line #L133 was not covered by tests
);
None
}
} else {
global::handle_error(PropagationError::extract(
"invalid baggage format",
"BaggagePropagator",
));
otel_warn!(

Check warning on line 138 in opentelemetry-sdk/src/propagation/baggage.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/propagation/baggage.rs#L138 

Added line #L138 was not covered by tests
name: "BaggagePropagator.Extract.InvalidFormat",
message = "Invalid baggage format",
baggage_header = header_value);

Check warning on line 141 in opentelemetry-sdk/src/propagation/baggage.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/propagation/baggage.rs#L141 

Added line #L141 was not covered by tests
None
}
});
Expand Down
Loading