Skip to content

fix: unintended exception omittion #736

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 5 commits into from
Sep 25, 2023
Merged

fix: unintended exception omittion #736

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da9c73e
fix: use a custom formatter to prevent duplicate traceback
shkumagai Mar 30, 2023
6248e5d
fix: typo
shkumagai Mar 30, 2023
848c303
Merge branch 'main' into fix/unintended-exception-omittion
meredithslota Jun 6, 2023
fa69353
Merge branch 'main' into fix/unintended-exception-omittion
parthea Aug 9, 2023
b13b8ab
Merge branch 'main' into fix/unintended-exception-omittion
daniel-sanche Sep 25, 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
18 changes: 12 additions & 6 deletions 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 @@ -79,8 +79,18 @@ def __init__(
log_filter = CloudLoggingFilter(project=project_id, default_labels=labels)
self.addFilter(log_filter)

class _Formatter(logging.Formatter):
"""Formatter to format log message without traceback"""

def format(self, record):
"""Ignore exception info to avoid duplicating it
https://github.com/googleapis/python-logging/issues/382
"""
record.message = record.getMessage()
return self.formatMessage(record)

# make logs appear in GCP structured logging format
self._gcp_formatter = logging.Formatter(GCP_FORMAT)
self._gcp_formatter = _Formatter(GCP_FORMAT)

self._json_encoder_cls = json_encoder_cls or json.JSONEncoder

Expand Down Expand Up @@ -115,11 +125,7 @@ def format(self, record):
payload = '"message": {},'.format(encoded_message)

record._payload_str = payload or ""
# remove exception info to avoid duplicating it
# https://github.com/googleapis/python-logging/issues/382
record.exc_info = None
record.exc_text = None
# convert to GCP structred logging format
# convert to GCP structured logging format
gcp_payload = self._gcp_formatter.format(record)
return gcp_payload

Expand Down