Fix: preserve new baggage values in context on key conflict

[amitsinha11]

Fixes: #1060

[shakuzen]

Thanks for the pull request. It'd help to add a test (or tests) to demonstrate the cases where this was failing and is now fixed.

[amitsinha11]

@shakuzen UTs are added to demonstrate the fix.

[jonatan-ivanov]

@amitsinha11 Thank for the PR, could you please also sign-off your commits so the DCO check can pass? You can read more about it by clicking on the failing check.

[amitsinha11]

@jonatan-ivanov done, DCO check is ok now.

[shakuzen]

@chemicL could you review when you have a chance, in case we're missing anything from a Reactor or context-propagation perspective?

[chemicL]

@shakuzen the change looks great, I have no reservations.

[amitsinha11]

@shakuzen, could you merge this if all is ok?

[shakuzen]

It's on my list of things to do. I want to check on a few things before merging.

[shakuzen]

Thanks for the pull request and quick updates on feedback. This is now merged to 1.3.x and forward through main, so it will be in upcoming patch releases for actively maintained branches. Feel free to try out snapshots before the next release.