Merge branch 'main' into data-infra-sync

Author: scholtzan

.env.example

@@ -1,5 +1,7 @@
 # Environment variables for the local development environment
 ENV=local
+LOG_FORMAT=text
+LOG_LEVEL=debug
 APP_RELOAD=True
 APP_DEBUG=True
 

.secrets.baseline

@@ -106,14 +106,14 @@
         "filename": ".env.example",
         "hashed_secret": "4b9a4ce92b6a01a4cd6ee1672d31c043f2ae79ab",
         "is_verified": false,
-        "line_number": 8
+        "line_number": 10
       },
       {
         "type": "Secret Keyword",
         "filename": ".env.example",
         "hashed_secret": "77ea6398f252999314d609a708842a49fc43e055",
         "is_verified": false,
-        "line_number": 11
+        "line_number": 13
       }
     ],
     "README.md": [
@@ -126,5 +126,5 @@
       }
     ]
   },
-  "generated_at": "2023-04-06T17:29:22Z"
+  "generated_at": "2023-04-11T14:18:10Z"
 }

jbi/environment.py

@@ -46,7 +46,8 @@ class Settings(BaseSettings):
     bugzilla_api_key: str
 
     # Logging
-    log_level: str = "debug"
+    log_level: str = "info"
+    log_format: str = "json"  # set to "text" for human-readable logs
 
     # Sentry
     sentry_dsn: Optional[SentryDsn]

jbi/log.py

@@ -22,12 +22,18 @@
             "()": "dockerflow.logging.JsonLogFormatter",
             "logger_name": "jbi",
         },
+        "text": {
+            "format": "%(asctime)s %(levelname)-8s %(name)-15s %(message)s",
+            "datefmt": "%Y-%m-%d %H:%M:%S",
+        },
     },
     "handlers": {
         "console": {
             "level": settings.log_level.upper(),
             "class": "logging.StreamHandler",
-            "formatter": "mozlog_json",
+            "formatter": "text"
+            if settings.log_format.lower() == "text"
+            else "mozlog_json",
             "stream": sys.stdout,
         },
         "null": {