fix: flaky logging mdc tests #1410
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Roiocam
commented
Jul 23, 2024
| @@ -90,6 +91,12 @@ import pekko.annotation.InternalApi | |||
| } | |||
|
|
|||
| val marker: Option[Marker] = Option(event.getMarkerList).flatMap(_.asScala.headOption) | |||
| val mdc: Map[String, String] = Option(event.getMDCPropertyMap) | |||
| .filterNot(_.isEmpty) | |||
| .orElse(Option(MDC.getMDCAdapter.getCopyOfContextMap)) | |||
There was a problem hiding this comment.
if MDC didn't useLogbackMDCAdapter as mdcAdapter, then fallback to the original MDC field.
|
lgtm |
|
let us merge, and then we will see what happens |
|
@Roiocam can you backport this change to 1.0.x branch? |
they looks cool in 1.0.x |
|
I thought the test was flaky in 1.0.x - but not failing as often as in the main branch. Let me keep an eye on the 1.0.x builds. This test did not fail there last night. I'm going to try to backport some other changes to 1.0.x for other broken tests first. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves: #795, diagnostics: #795 (comment)
ci checks passed in my repo: