Skip to content

bugfix: BaggageTextMapPropagator does not mix with current context 1163 - #1174

Merged
shakuzen merged 2 commits into
micrometer-metrics:1.4.xfrom
tomaerden-everesst:bugfix/baggage-textmap-propagation
Sep 19, 2025
Merged

shakuzen merged 2 commits into
micrometer-metrics:1.4.xfrom
tomaerden-everesst:bugfix/baggage-textmap-propagation

Conversation

@tomaerden-everesst

Copy link
Copy Markdown
Contributor

also: BaggageTextMapPropagator prefers carrier values

@tomaerden-everesst tomaerden-everesst changed the title bugfix: BaggageTextMapPropagator does not mix with current context (#1163) bugfix: BaggageTextMapPropagator does not mix with current context 1163 Sep 15, 2025
@tomaerden-everesst
tomaerden-everesst force-pushed the bugfix/baggage-textmap-propagation branch from 5ff838f to e1acdec Compare September 15, 2025 14:48
@tomaerden-everesst

tomaerden-everesst commented Sep 15, 2025 •

Copy link
Copy Markdown
Contributor Author

build contains a test error, although this is not reflected in the build status (main is also flaky)
AbstractObservationAwareSpanThreadLocalAccessorTests.onlyReactorPropagatesBaggage (BraveConfig)

@shakuzen

Copy link
Copy Markdown
Member

also: BaggageTextMapPropagator prefers carrier values

That looks to fix the recently reported issue #1172

@shakuzen shakuzen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the pull request. It looks good to me. I left one minor question, and I can polish things when merging. I manually re-ran the build to deal with the flaky test.

@tomaerden-everesst
tomaerden-everesst force-pushed the bugfix/baggage-textmap-propagation branch from bd7c49c to 07b5c88 Compare September 19, 2025 11:18
…icrometer-metrics#1163)

BaggageTextMapPropagator prefers carrier values

Signed-off-by: Tom Aerden <tom.aerden@cegeka.com>
…icrometer-metrics#1163)

BaggageTextMapPropagator prefers carrier values

Signed-off-by: Tom Aerden <tom.aerden@cegeka.com>
@shakuzen
shakuzen force-pushed the bugfix/baggage-textmap-propagation branch from 07b5c88 to d9cbfe1 Compare September 19, 2025 11:46
@shakuzen
shakuzen changed the base branch from main to 1.4.x September 19, 2025 11:46

@shakuzen shakuzen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the pull request. I've rebased on 1.4.x and we'll merge forward from there.

@shakuzen
shakuzen merged commit 9627271 into micrometer-metrics:1.4.x Sep 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

BaggageTextMapPropagator gives precedence to baggage values of provided context BaggageTextMapPropagator uses current context

2 participants