From 0bae6634f7cf7ed9721dd88ed003548d331f4ae4 Mon Sep 17 00:00:00 2001 From: Philippe Geraldeli Araujo Date: Wed, 17 Apr 2024 16:13:39 -0300 Subject: [PATCH 1/2] feat: add variable to activate logging timestamp on logs --- slo_generator/constants.py | 1 + slo_generator/utils.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/slo_generator/constants.py b/slo_generator/constants.py index fe199a85..02dccfde 100644 --- a/slo_generator/constants.py +++ b/slo_generator/constants.py @@ -27,6 +27,7 @@ COLORED_OUTPUT: int = int(os.environ.get("COLORED_OUTPUT", "0")) DRY_RUN: bool = bool(int(os.environ.get("DRY_RUN", "0"))) DEBUG: int = int(os.environ.get("DEBUG", "0")) +LOGGING_TIMESTAMP_ENABLED: int = int(os.environ.get("LOGGING_TIMESTAMP_ENABLED", "0")) # Exporters supporting v2 SLO report format V2_EXPORTERS: Tuple[str, ...] = ("Pubsub", "Cloudevent") diff --git a/slo_generator/utils.py b/slo_generator/utils.py index 1549bd24..9a5fa679 100644 --- a/slo_generator/utils.py +++ b/slo_generator/utils.py @@ -32,7 +32,7 @@ import yaml from dateutil import tz -from slo_generator.constants import DEBUG +from slo_generator.constants import DEBUG, LOGGING_TIMESTAMP_ENABLED try: # pytype: disable=import-error @@ -182,6 +182,10 @@ def setup_logging(): else: level = logging.INFO format_str = "%(levelname)s - %(message)s" + + if LOGGING_TIMESTAMP_ENABLED == "1": + format_str = "%(asctime)s " + format_str + logging.basicConfig( stream=sys.stdout, level=level, format=format_str, datefmt="%m/%d/%Y %I:%M:%S" ) From 9234c9799599845332bd4aac8a75cc4dbe402865 Mon Sep 17 00:00:00 2001 From: Philippe Geraldeli Araujo Date: Wed, 17 Apr 2024 16:32:00 -0300 Subject: [PATCH 2/2] feat: change format to 24hours --- slo_generator/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slo_generator/utils.py b/slo_generator/utils.py index 9a5fa679..7358d6ce 100644 --- a/slo_generator/utils.py +++ b/slo_generator/utils.py @@ -187,7 +187,7 @@ def setup_logging(): format_str = "%(asctime)s " + format_str logging.basicConfig( - stream=sys.stdout, level=level, format=format_str, datefmt="%m/%d/%Y %I:%M:%S" + stream=sys.stdout, level=level, format=format_str, datefmt="%m/%d/%Y %H:%M:%S" ) logging.getLogger("googleapiclient").setLevel(logging.ERROR)