-
Notifications
You must be signed in to change notification settings - Fork 319
Add JSON logging format support with environment variable control #2120
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
fef36f8
Add JSON log format for runner and KRR scan jobs (ROB-459)
claude d393913
Regenerate poetry.lock with Poetry 1.8.5
claude bcfa496
Fix runner poetry.lock and drop debug print
claude ede94ce
Address CodeRabbit review on log_init
claude 004e05c
Merge branch 'master' into claude/json-log-format-runner-vqbzst
moshemorad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| import importlib | ||
| import json | ||
| import logging | ||
| from io import StringIO | ||
|
|
||
| import pytest | ||
|
|
||
|
|
||
| @pytest.fixture(autouse=True) | ||
| def restore_root_logger(): | ||
| """Snapshot and restore the root logger so handlers don't leak between tests.""" | ||
| root = logging.getLogger() | ||
| saved_handlers = root.handlers[:] | ||
| saved_level = root.level | ||
| try: | ||
| yield | ||
| finally: | ||
| root.handlers = saved_handlers | ||
| root.setLevel(saved_level) | ||
|
|
||
|
|
||
| def _reload_log_init(monkeypatch, json_enabled: bool): | ||
| """Reload env_vars + log_init so ENABLE_JSON_LOGS_FORMAT is re-read from env.""" | ||
| monkeypatch.setenv("ENABLE_JSON_LOGS_FORMAT", "true" if json_enabled else "false") | ||
|
|
||
| import robusta.core.model.env_vars as env_vars | ||
|
|
||
| importlib.reload(env_vars) | ||
|
|
||
| import robusta.runner.log_init as log_init | ||
|
|
||
| importlib.reload(log_init) | ||
| return log_init | ||
|
|
||
|
|
||
| def _capture_root_output() -> StringIO: | ||
| """Attach a StringIO stream handler to the root logger and return the buffer.""" | ||
| buffer = StringIO() | ||
| handler = logging.StreamHandler(buffer) | ||
| handler.setFormatter(logging.getLogger().handlers[0].formatter) | ||
| logging.getLogger().addHandler(handler) | ||
| return buffer | ||
|
|
||
|
|
||
| def test_json_logging_emits_valid_json(monkeypatch): | ||
| log_init = _reload_log_init(monkeypatch, json_enabled=True) | ||
| log_init.init_logging() | ||
|
|
||
| buffer = _capture_root_output() | ||
| logging.getLogger().info("hello json") | ||
|
|
||
| line = buffer.getvalue().strip().splitlines()[-1] | ||
| payload = json.loads(line) | ||
| assert payload["message"] == "hello json" | ||
| # levelname is renamed to severity to match the other Robusta services. | ||
| assert payload["severity"] == "INFO" | ||
|
|
||
|
|
||
| def test_plain_logging_is_not_json(monkeypatch): | ||
| log_init = _reload_log_init(monkeypatch, json_enabled=False) | ||
| log_init.init_logging() | ||
|
|
||
| buffer = _capture_root_output() | ||
| logging.getLogger().info("hello text") | ||
|
|
||
| line = buffer.getvalue().strip().splitlines()[-1] | ||
| assert "hello text" in line | ||
| try: | ||
| json.loads(line) | ||
| is_json = True | ||
| except json.JSONDecodeError: | ||
| is_json = False | ||
| assert not is_json | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.