Skip to content
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

vdk-structlog: LTSV formatting #2887

Merged
merged 8 commits into from
Nov 14, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,24 @@ def add_fields(
del log_record["created"]


class LtsvFormatter(Formatter):
"""
Formats logs in the Labelled Tab Separated Values (LTSV) format.
You can read more about this format here: http://ltsv.org/

"""

def format(self, record: LogRecord) -> LogRecord:
record.message = record.getMessage()
record.timestamp = self.formatTime(record, self.datefmt)
record.line_number = record.lineno
if ("level" not in record.__dict__) or (not record.__dict__["level"]):
record.level = record.levelname

s = self.formatMessage(record)
return s


class ConsoleFormatter(Formatter):
"""
Console formatter. Basically the same as logging.Formatter.
Expand Down Expand Up @@ -102,6 +120,17 @@ def build_console_format(self) -> str:
out.append("- %(message)s")
return " ".join(out)

def build_ltsv_format(self) -> str:
out = []
for key in self._metadata_keys:
if key in STRUCTLOG_LOGGING_METADATA_ALL:
out.append(key + ":" + STRUCTLOG_LOGGING_METADATA_ALL[key])
else:
out.append(key + ":" + f"%({key})s")
out.append("message:%(message)s")
ltsv_format = "\t".join(out)
return ltsv_format


def create_formatter(logging_format: str, metadata_keys: str) -> [Formatter, Filter]:
"""
Expand All @@ -118,6 +147,11 @@ def create_formatter(logging_format: str, metadata_keys: str) -> [Formatter, Fil
StructlogMetadataBuilder(metadata_keys).build_json_format()
)
custom_key_filter = JsonMetadataFilter(key_set)
elif logging_format == "ltsv":
formatter = LtsvFormatter(
fmt=StructlogMetadataBuilder(metadata_keys).build_ltsv_format()
)
custom_key_filter = ConsoleMetadataFilter(key_set)
else:
formatter = ConsoleFormatter(
fmt=StructlogMetadataBuilder(metadata_keys).build_console_format()
Expand Down
12 changes: 10 additions & 2 deletions projects/vdk-plugins/vdk-structlog/tests/test_structlog.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@
"function_name": "run",
"vdk_job_name": JOB_NAME,
},
"ltsv": {
"timestamp": r"timestamp:\d+\.\d+",
"level": r"level:INFO",
"file_name": r"file_name:10_dummy\.py",
"line_number": "line_number:[0-9]+",
"function_name": "function_name:run",
"vdk_job_name": f"vdk_job_name:{JOB_NAME}",
},
"json": {
"timestamp": r'"timestamp": \d+\.\d+',
"level": '"level": "INFO"',
Expand All @@ -48,7 +56,7 @@
}


@pytest.mark.parametrize("log_format", ["console", "json"])
@pytest.mark.parametrize("log_format", ["console", "ltsv", "json"])
def test_structlog(log_format):
with mock.patch.dict(
os.environ,
Expand Down Expand Up @@ -76,7 +84,7 @@ def test_structlog(log_format):
)


@pytest.mark.parametrize("log_format", ["console", "json"])
@pytest.mark.parametrize("log_format", ["console", "ltsv", "json"])
def test_stock_fields_removal(log_format):
stock_field_reps = STOCK_FIELD_REPRESENTATIONS[log_format]

Expand Down