Skip to content

Commit 87070e4

Browse files
committed
@pcrespov format log format
1 parent d0487f0 commit 87070e4

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,26 @@ def config_all_loggers(
139139
fmt = DEFAULT_FORMATTING
140140
if tracing_settings is not None:
141141
fmt = (
142-
"log_level=%(levelname)s | log_timestamp=%(asctime)s | log_source=%(name)s:%(funcName)s(%(lineno)d) | log_uid=%(log_uid)s "
143-
"| trace_id=%(otelTraceID)s | span_id=%(otelSpanID)s | resource.service.name=%(otelServiceName)s | trace_sampled=%(otelTraceSampled)s] "
142+
"log_level=%(levelname)s "
143+
"| log_timestamp=%(asctime)s "
144+
"| log_source=%(name)s:%(funcName)s(%(lineno)d) "
145+
"| log_uid=%(log_uid)s "
146+
"| log_oec=%(log_oec)s"
147+
"| trace_id=%(otelTraceID)s "
148+
"| span_id=%(otelSpanID)s "
149+
"| resource.service.name=%(otelServiceName)s "
150+
"| trace_sampled=%(otelTraceSampled)s] "
144151
"| log_msg=%(message)s"
145152
)
146153
setup_log_tracing(tracing_settings=tracing_settings)
147154
if log_format_local_dev_enabled:
148155
fmt = LOCAL_FORMATTING
149156
if tracing_settings is not None:
150-
fmt = "%(levelname)s: [%(asctime)s/%(processName)s] [trace_id=%(otelTraceID)s span_id=%(otelSpanID)s resource.service.name=%(otelServiceName)s trace_sampled=%(otelTraceSampled)s] [%(name)s:%(funcName)s(%(lineno)d)] - %(message)s"
157+
fmt = (
158+
"%(levelname)s: [%(asctime)s/%(processName)s] "
159+
"[trace_id=%(otelTraceID)s span_id=%(otelSpanID)s resource.service.name=%(otelServiceName)s trace_sampled=%(otelTraceSampled)s] "
160+
"[%(name)s:%(funcName)s(%(lineno)d)] - %(message)s"
161+
)
151162

152163
for logger in loggers:
153164
_set_logging_handler(

0 commit comments

Comments
 (0)