Skip to content

Commit b6a7785

Browse files
committed
improve error reporting
1 parent 9123420 commit b6a7785

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

packages/service-library/src/servicelib/logging_utils.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from common_library.json_serialization import json_dumps
2323
from settings_library.tracing import TracingSettings
2424

25+
from .logging_errors import create_troubleshootting_log_kwargs
2526
from .logging_utils_filtering import GeneralLogFilter, LoggerName, MessageSubstring
2627
from .tracing import setup_log_tracing
2728
from .utils_secrets import mask_sensitive_data
@@ -97,9 +98,9 @@ def format(self, record) -> str:
9798
if hasattr(record, "file_name_override"):
9899
record.filename = record.file_name_override
99100

100-
optional_keys = LogExtra.__optional_keys__ | frozenset( # pylint: disable=no-member
101+
optional_keys = LogExtra.__optional_keys__ | frozenset(
101102
["otelTraceID", "otelSpanID"]
102-
)
103+
) # pylint: disable=no-member
103104
for name in optional_keys:
104105
if not hasattr(record, name):
105106
setattr(record, name, None)
@@ -572,7 +573,13 @@ def log_catch(logger: logging.Logger, *, reraise: bool = True) -> Iterator[None]
572573
logger.debug("call was cancelled")
573574
raise
574575
except Exception as exc: # pylint: disable=broad-except
575-
logger.exception("Unhandled exception:")
576+
if not reraise:
577+
logger.exception(
578+
**create_troubleshootting_log_kwargs(
579+
"Caught unhandled exception",
580+
error=exc,
581+
)
582+
)
576583
if reraise:
577584
raise exc from exc
578585

0 commit comments

Comments
 (0)