Revert "Add %z for %(asctime)s to fix timezone for logs on UI (#24373)"

airflow/config_templates/airflow_local_settings.py

@@ -31,16 +31,13 @@
 # settings.py and cli.py. Please see AIRFLOW-1455.
 LOG_LEVEL: str = conf.get_mandatory_value('logging', 'LOGGING_LEVEL').upper()
 
+
 # Flask appbuilder's info level log is very verbose,
 # so it's set to 'WARN' by default.
 FAB_LOG_LEVEL: str = conf.get_mandatory_value('logging', 'FAB_LOGGING_LEVEL').upper()
 
 LOG_FORMAT: str = conf.get_mandatory_value('logging', 'LOG_FORMAT')
 
-LOG_FORMATTER_CLASS: str = conf.get_mandatory_value(
-    'logging', 'LOG_FORMATTER_CLASS', fallback='airflow.utils.log.timezone_aware.TimezoneAware'
-)
-
 COLORED_LOG_FORMAT: str = conf.get_mandatory_value('logging', 'COLORED_LOG_FORMAT')
 
 COLORED_LOG: bool = conf.getboolean('logging', 'COLORED_CONSOLE_LOG')
@@ -63,13 +60,10 @@
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
-        'airflow': {
-            'format': LOG_FORMAT,
-            'class': LOG_FORMATTER_CLASS,
-        },
+        'airflow': {'format': LOG_FORMAT},
         'airflow_coloured': {
             'format': COLORED_LOG_FORMAT if COLORED_LOG else LOG_FORMAT,
-            'class': COLORED_FORMATTER_CLASS if COLORED_LOG else LOG_FORMATTER_CLASS,
+            'class': COLORED_FORMATTER_CLASS if COLORED_LOG else 'logging.Formatter',
         },
     },
     'filters': {

airflow/config_templates/config.yml

@@ -633,12 +633,6 @@
       type: string
       example: ~
       default: "%%(asctime)s %%(levelname)s - %%(message)s"
-    - name: log_formatter_class
-      description: ~
-      version_added: 2.3.3
-      type: string
-      example: ~
-      default: "airflow.utils.log.timezone_aware.TimezoneAware"
     - name: task_log_prefix_template
       description: |
         Specify prefix pattern like mentioned below with stream handler TaskHandlerWithCustomFormatter

airflow/config_templates/default_airflow.cfg

@@ -349,7 +349,6 @@ colored_formatter_class = airflow.utils.log.colored_log.CustomTTYColoredFormatte
 # Format of Log line
 log_format = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - %%(message)s
 simple_log_format = %%(asctime)s %%(levelname)s - %%(message)s
-log_formatter_class = airflow.utils.log.timezone_aware.TimezoneAware
 
 # Specify prefix pattern like mentioned below with stream handler TaskHandlerWithCustomFormatter
 # Example: task_log_prefix_template = {{ti.dag_id}}-{{ti.task_id}}-{{execution_date}}-{{try_number}}

airflow/utils/log/colored_log.py

@@ -43,10 +43,6 @@ class CustomTTYColoredFormatter(TTYColoredFormatter):
     traceback.
     """
 
-    # copy of airflow.utils.log.timezone_aware.TimezoneAware
-    default_time_format = '%Y-%m-%d %H:%M:%S%z'
-    default_msec_format = '%s %03dms'
-
     def __init__(self, *args, **kwargs):
         kwargs["stream"] = sys.stdout or kwargs.get("stream")
         kwargs["log_colors"] = DEFAULT_COLORS

airflow/www/static/js/grid/details/content/taskInstance/Logs/utils.ts

@@ -61,41 +61,18 @@ export const parseLogs = (
     }
 
     const regExp = /\[(.*?)\] \{(.*?)\}/;
-    // e.g) '2022-06-15 10:30:06,020' or '2022-06-15 10:30:06+0900'
-    const dateRegex = /(\d{4}[./-]\d{2}[./-]\d{2} \d{2}:\d{2}:\d{2})((,\d{3})|([+-]\d{4} \d{3}ms))/;
-    // above regex is a kind of duplication of 'dateRegex'
-    // in airflow/www/static/js/tl_log.js
     const matches = line.match(regExp);
     let logGroup = '';
     if (matches) {
-      // Replace system timezone with user selected timezone.
+      // Replace UTC with the local timezone.
       const dateTime = matches[1];
-
-      // e.g) '2022-06-15 10:30:06,020' or '2022-06-15 10:30:06+0900 123ms'
-      const dateMatches = dateTime?.match(dateRegex);
-      if (dateMatches) {
-        const [date, msecOrUTCOffset] = [dateMatches[1], dateMatches[2]];
-        if (msecOrUTCOffset.startsWith(',')) { // e.g) date='2022-06-15 10:30:06', msecOrUTCOffset=',020'
-          // for backward compatibility. (before 2.3.3)
-          // keep previous behavior if utcoffset not found. (consider it UTC)
-          //
-          if (dateTime && timezone) { // dateTime === fullMatch
-            // @ts-ignore
-            const localDateTime = moment.utc(dateTime).tz(timezone).format(defaultFormatWithTZ);
-            parsedLine = line.replace(dateTime, localDateTime);
-          }
-        } else {
-          // e.g) date='2022-06-15 10:30:06', msecOrUTCOffset='+0900 123ms'
-          // (formatted by airflow.utils.log.timezone_aware.TimezoneAware) (since 2.3.3)
-          const [utcoffset, threeDigitMs] = msecOrUTCOffset.split(' ');
-          const msec = threeDigitMs.replace(/\D+/g, ''); // drop 'ms'
-          // e.g) datetime='2022-06-15 10:30:06.123+0900'
-          // @ts-ignore
-          const localDateTime = moment(`${date}.${msec}${utcoffset}`).tz(timezone).format(defaultFormatWithTZ);
-          parsedLine = line.replace(dateTime, localDateTime);
-        }
-      }
       [logGroup] = matches[2].split(':');
+      if (dateTime && timezone) {
+        // @ts-ignore
+        const localDateTime = moment.utc(dateTime).tz(timezone).format(defaultFormatWithTZ);
+        parsedLine = line.replace(dateTime, localDateTime);
+      }
+
       fileSources.add(logGroup);
     }
 

airflow/www/static/js/ti_log.js

@@ -102,9 +102,7 @@ function autoTailingLog(tryNumber, metadata = null, autoTailing = false) {
 
       // Detect urls and log timestamps
       const urlRegex = /http(s)?:\/\/[\w.-]+(\.?:[\w.-]+)*([/?#][\w\-._~:/?#[\]@!$&'()*+,;=.%]+)?/g;
-      const dateRegex = /(\d{4}[./-]\d{2}[./-]\d{2} \d{2}:\d{2}:\d{2})((,\d{3})|([+-]\d{4} \d{3}ms))/g;
-      // above regex is a kind of duplication of 'dateRegex'
-      // in airflow/www/static/js/grid/details/content/taskinstance/Logs/utils.js
+      const dateRegex = /\d{4}[./-]\d{2}[./-]\d{2} \d{2}:\d{2}:\d{2},\d{3}/g;
 
       res.message.forEach((item) => {
         const logBlockElementId = `try-${tryNumber}-${item[0]}`;
@@ -122,22 +120,7 @@ function autoTailingLog(tryNumber, metadata = null, autoTailing = false) {
         const escapedMessage = escapeHtml(item[1]);
         const linkifiedMessage = escapedMessage
           .replace(urlRegex, (url) => `<a href="${url}" target="_blank">${url}</a>`)
-          .replaceAll(dateRegex, (dateMatches, date, msecOrUTCOffset) => {
-            // e.g) '2022-06-15 10:30:06,020' or '2022-06-15 10:30:06+0900 123ms'
-            if (msecOrUTCOffset.startsWith(',')) { // e.g) date='2022-06-15 10:30:06', msecOrUTCOffset=',020'
-              // for backward compatibility. (before 2.3.3)
-              // keep previous behavior if utcoffset not found.
-              //
-              return `<time datetime="${dateMatches}+00:00" data-with-tz="true">${formatDateTime(`${dateMatches}+00:00`)}</time>`;
-            }
-            // e.g) date='2022-06-15 10:30:06', msecOrUTCOffset='+0900 123ms'
-            // (formatted by airflow.utils.log.timezone_aware.TimezoneAware) (since 2.3.3)
-            const [utcoffset, threeDigitMs] = msecOrUTCOffset.split(' ');
-            const msec = threeDigitMs.replace(/\D+/g, ''); // drop 'ms'
-            const dateTime = `${date}.${msec}${utcoffset}`; // e.g) datetime='2022-06-15 10:30:06.123+0900'
-            //
-            return `<time datetime="${dateTime}" data-with-tz="true">${formatDateTime(`${dateTime}`)}</time>`;
-          });
+          .replaceAll(dateRegex, (date) => `<time datetime="${date}+00:00" data-with-tz="true">${formatDateTime(`${date}+00:00`)}</time>`);
         logBlock.innerHTML += `${linkifiedMessage}\n`;
       });