Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect LogFormat when using ES logging with Json Format #13310

Merged
merged 1 commit into from
Dec 25, 2020

Conversation

kaxil
Copy link
Member

@kaxil kaxil commented Dec 24, 2020

This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.

Before:
image

After:
image


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

try:
# pylint: disable=protected-access
return self.formatter._style.format(_ESJsonLogFmt(**log_line.to_dict()))
except Exception: # noqa pylint: disable=broad-except
Copy link
Member

Choose a reason for hiding this comment

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

What is the reason for exception?

Copy link
Member Author

Choose a reason for hiding this comment

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

For now, I can only foresee KeyError here i.e. if log_format has a key that is not present in ES logs:

log_format = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - %%(message)s

Copy link
Member Author

Choose a reason for hiding this comment

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

But kept a broad-except to avoid any unforeseen exception but it is just a safeguard and keeps the same behavior as now i.e. return log_line.message

@kaxil kaxil added the full tests needed We need to run full set of tests for this PR to merge label Dec 25, 2020
This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.
@github-actions
Copy link

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest master or amend the last commit of the PR, and push it with --force-with-lease.

@github-actions github-actions bot added the okay to merge It's ok to merge this PR as it does not require more tests label Dec 25, 2020
@kaxil kaxil merged commit b6bf253 into apache:master Dec 25, 2020
@kaxil kaxil deleted the show-log-meta-es branch December 25, 2020 12:18
kaxil added a commit to astronomer/airflow that referenced this pull request Jan 4, 2021
This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.

(cherry-picked from b6bf253)

(cherry picked from commit d16baf79bcdfe0b0266d1ac08e07f12285971b82)
kaxil added a commit to astronomer/airflow that referenced this pull request Jan 4, 2021
This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.

(cherry-picked from b6bf253)

(cherry picked from commit d16baf79bcdfe0b0266d1ac08e07f12285971b82)
(cherry picked from commit 18644b5)
kaxil added a commit to astronomer/airflow that referenced this pull request Jan 5, 2021
This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.

(cherry-picked from b6bf253)

(cherry picked from commit d16baf79bcdfe0b0266d1ac08e07f12285971b82)
kaxil added a commit to astronomer/airflow that referenced this pull request Jan 5, 2021
This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.

(cherry-picked from b6bf253)
Dr-Denzy pushed a commit to astronomer/airflow that referenced this pull request Jan 20, 2021
This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.

(cherry-picked from b6bf253)
kaxil added a commit to astronomer/airflow that referenced this pull request Jun 2, 2021
This was a log standing bug / behaviour where Timestamps, log level,
line number etc were not shown when using ElasticSearch Task Handler
(Elasticsearch as remote logging) with json_format=True.

(cherry-picked from b6bf253)

(cherry picked from commit a6acb49)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:logging full tests needed We need to run full set of tests for this PR to merge okay to merge It's ok to merge this PR as it does not require more tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants