fix(tracing): Ensure clean MDC context at top coroutine scopes #1845
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
emjburns
reviewed
Mar 4, 2021
| @@ -15,6 +15,8 @@ class TracingSupport { | |||
| companion object { | |||
| const val X_SPINNAKER_RESOURCE_ID = "X-SPINNAKER-RESOURCE-ID" | |||
|
|
|||
| val clearMDC: MDCContext = MDCContext(emptyMap()) | |||
There was a problem hiding this comment.
I think this should be emptyMDC - when I read it as a parameter I thought it was a function that cleared the mdc context.
Actually, I think any wording for this - "empty", "clean", "clear" would have given me the same thought. Maybe blankMDC? Change if you think that is more helpful or clear, if you don't think it adds anything feel free to ignore.
There was a problem hiding this comment.
Renamed to blankMDC.
emjburns
reviewed
Mar 4, 2021
| @@ -34,13 +34,13 @@ class VerificationRunner( | |||
| } | |||
|
|
|||
| if (statuses.anyStillRunning) { | |||
| log.debug("Verification already running for {}", environment.name) | |||
| log.debug("Verification already running for environment {} of application {}", environment.name, deliveryConfig.application) | |||
emjburns
approved these changes
Mar 4, 2021
osoriano
pushed a commit
to osoriano/keel
that referenced
this pull request
Sep 2, 2023
…aker#1845) * fix(tracing): Ensure clean MDC context at top coroutine scopes * fix(pr): Rename clearMDC to blankMDC per review * chore(logs): Improve log message for stale promotion checks Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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.
Follow-up to #1841. Following the discussion and recommendations in Kotlin/kotlinx.coroutines#985, this PR adds an empty
MDCContextto all top-level coroutine scopes wherewithTracingContextis used, in an attempt to remove left-overX-SPINNAKER-RESOURCE-IDs when switching threads.Hopefully fixes #1122.