Skip to content

fix: send StructuredLogHandler instrumentation log using an explicit logger #705

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.

Sign up for GitHub

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
daniel-sanche merged 7 commits into from
Jan 18, 2023
Merged

fix: send StructuredLogHandler instrumentation log using an explicit logger #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
977e76e
fix: send instrumentation log using an explicit logger
daniel-sanche Jan 14, 2023
7120338
Merge branch 'main' into structured_log_instrumentation_fix
daniel-sanche Jan 14, 2023
2ab368d
use __name__ for logger name, as suggested in logging docs
daniel-sanche Jan 17, 2023
c285f4f
Merge branch 'structured_log_instrumentation_fix' of github.com:googl…
daniel-sanche Jan 17, 2023
6e444cd
updated test
daniel-sanche Jan 17, 2023
66a47c0
Merge branch 'main' into structured_log_instrumentation_fix
daniel-sanche Jan 17, 2023
7554fff
Merge branch 'main' into structured_log_instrumentation_fix
daniel-sanche Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion google/cloud/logging_v2/handlers/structured_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,8 @@ def emit(self, record):
def emit_instrumentation_info(self):
google.cloud.logging_v2._instrumentation_emitted = True
diagnostic_object = _create_diagnostic_entry()
logging.info(diagnostic_object.payload)
struct_logger = logging.getLogger(__name__)
struct_logger.addHandler(self)
struct_logger.setLevel(logging.INFO)
struct_logger.info(diagnostic_object.payload)
struct_logger.handlers.clear()
3 changes: 2 additions & 1 deletion tests/unit/handlers/test_structured_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,8 @@ def test_valid_instrumentation_info(self):
import mock
import json

with mock.patch.object(logging, "info") as mock_log:
logger = logging.getLogger("google.cloud.logging_v2.handlers.structured_log")
with mock.patch.object(logger, "info") as mock_log:
handler = self._make_one()
handler.emit_instrumentation_info()
mock_log.assert_called_once()
Expand Down