8000 Fix KeyError in log format for requests without AWS context by viren-nadkarni · Pull Request #9132 · localstack/localstack · GitHub
[go: up one dir, main page]

Skip to content

Fix KeyError in log format for requests without AWS context #9132

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 1 commit into from
Sep 13, 2023
Merged
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions localstack/logging/format.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

LOG_FORMAT = f"%(asctime)s.%(msecs)03d %(ls_level)5s --- [%(ls_thread){MAX_THREAD_NAME_LEN}s] %(ls_name)-{MAX_NAME_LEN}s : %(message)s"
LOG_DATE_FORMAT = "%Y-%m-%dT%H:%M:%S"
LOG_INPUT_FORMAT = "%(input_type)s(%(input)s, headers=%(request_headers)s)"
LOG_OUTPUT_FORMAT = "%(output_type)s(%(output)s, headers=%(response_headers)s)"
LOG_CONTEXT_FORMAT = "%(account_id)s/%(region)s"

CUSTOM_LEVEL_NAMES = {
50: "FATAL",
Expand Down Expand Up @@ -106,17 +109,16 @@ def compress_logger_name(name: str, length: int) -> str:


class TraceLoggingFormatter(logging.Formatter):
aws_trace_log_format = (
LOG_FORMAT + "; %(account_id)s/%(region)s; "
"%(input_type)s(%(input)s, headers=%(request_headers)s); "
"%(output_type)s(%(output)s, headers=%(response_headers)s)"
)
aws_trace_log_format = "; ".join([LOG_FORMAT, LOG_INPUT_FORMAT, LOG_OUTPUT_FORMAT])

def __init__(self):
super().__init__(fmt=self.aws_trace_log_format, datefmt=LOG_DATE_FORMAT)


class AwsTraceLoggingFormatter(TraceLoggingFormatter):
aws_trace_log_format = "; ".join(
[LOG_FORMAT, LOG_CONTEXT_FORMAT, LOG_INPUT_FORMAT, LOG_OUTPUT_FORMAT]
)
bytes_length_display_threshold = 512

def __init__(self):
Expand Down
0