Simplify log context setting / propagation handling #28571
Closed
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
dstandish
force-pushed
the
try-no-propagate-shenanigans
branch
from
7afdf03
to
48a9910
Compare
dstandish
changed the title
dstandish
force-pushed
the
try-no-propagate-shenanigans
branch
2 times, most recently
from
607225a
to
ec96172
Compare
dstandish
changed the title
…text After apache#28440, instead of having a task logger both at `airflow.task` and root logger, we only have it at root logger. This means we can remove the logic to set propagate to False, because there's no longer a risk of record processed by FTH twice. It also means we can remove the logic to walk up the logger hierarchy and set context because we don't need to hit both airflow.task and root -- there will only ever be one such handler instance. So in effect we deprecate the MAINTAIN_PROPAGATE logic and no longer set propagate=False by default. While we could probably remove the "DISABLE_PROPAGATE" logic too (it's only used by file processor) it doesn't really hurt to leave it. (cherry picked from commit b9ed441f9127503f55e338f728e68f10bc77f3df)
dstandish
force-pushed
the
try-no-propagate-shenanigans
branch
from
ec96172
to
7ece9f4
Compare
dstandish
commented
Jan 28, 2023
| @@ -218,24 +224,14 @@ def set_context(logger, value): | |||
| :param logger: logger | |||
| :param value: value to set | |||
| """ | |||
| while logger: | |||
| orig_propagate = logger.propagate | |||
| if value is not None: | |||
There was a problem hiding this comment.
The changes in this function are mainly what this PR is about. We no longer need to "walk" the logger hierarchy because we no longer duplicate task logging handlers.
And as a result we no longer need to disable propagation by default, so we can revert back to the prior approach of just disabling when explicitly asked to do so.
uranusjr
reviewed
Jan 30, 2023
| class SetContextPropagate(enum.Enum): | ||
| """:meta private:""" | ||
| """ | ||
| Deprecated. Previously used to allow disabling of propagation (the default) of |
There was a problem hiding this comment.
Since this is a private class, can we remove this outright?
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 5 days if no further activity occurs. Thank you for your contributions. |
github-actions
bot
added
the
stale
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.
Assumes #28440 merged first.
After #28440, instead of having a task logger both at
airflow.taskand root logger, we only have it at root logger. This means we can remove the logic to set propagate=False, because there's no longer a risk of record processed by FTH twice.It also means we can remove the logic to walk up the logger hierarchy and set context because we don't need to hit both airflow.task and root -- there will only ever be one such handler instance.
For file processor, we can go back to the old approach where we optionally disable propagation by returning a sentinel value, rather than disabling by default. Though we probably could remove it entirely.