[ChromeDriver] Add readable timestamp to log in Py tests

Bug: chromedriver:1231
Change-Id: I4be96e0105cc6e854a7ef01ad9d0dc4dd965ec6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1627552Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Tatiana Buldina <buldina@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663791}

chrome/test/chromedriver/logging.cc

@@ -39,6 +39,8 @@ Log::Level g_log_level = Log::kWarning;
 
 int64_t g_start_time = 0;
 
+bool readable_timestamp;
+
 // Array indices are the Log::Level enum values.
 const char* const kLevelToName[] = {
   "ALL",  // kAll
@@ -109,13 +111,47 @@ bool HandleLogMessage(int severity,
 
   if (level >= g_log_level) {
     const char* level_name = LevelToName(level);
-    std::string entry = base::StringPrintf(
-        "[%.3lf][%s]: %s",
-        base::TimeDelta(base::TimeTicks::Now() -
-                        base::TimeTicks::UnixEpoch())
-            .InSecondsF(),
-        level_name,
-        message.c_str());
+    std::string entry;
+
+    if (readable_timestamp) {
+#if defined(OS_WIN)
+      SYSTEMTIME local_time;
+      GetLocalTime(&local_time);
+
+      entry = base::StringPrintf(
+          "[%02d-%02d-%04d %02d:%02d:%02d.%03d][%s]: %s",
+          local_time.wMonth, local_time.wDay, local_time.wYear,
+          local_time.wHour, local_time.wMinute, local_time.wSecond,
+          local_time.wMilliseconds,
+          level_name,
+          message.c_str());
+#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+      timeval tv;
+      gettimeofday(&tv, nullptr);
+      time_t t = tv.tv_sec;
+      struct tm local_time;
+      localtime_r(&t, &local_time);
+      struct tm* tm_time = &local_time;
+
+      entry = base::StringPrintf(
+          "[%02d-%02d-%04d %02d:%02d:%02d.%06ld][%s]: %s",
+          1 + tm_time->tm_mon, tm_time->tm_mday, 1900 + tm_time->tm_year,
+          tm_time->tm_hour, tm_time->tm_min, tm_time->tm_sec,
+          static_cast<long>(tv.tv_usec),
+          level_name,
+          message.c_str());
+#else
+#error Unsupported platform
+#endif
+    } else {
+      entry = base::StringPrintf(
+          "[%.3lf][%s]: %s",
+          base::TimeDelta(base::TimeTicks::Now() -
+                          base::TimeTicks::UnixEpoch())
+              .InSecondsF(),
+          level_name,
+          message.c_str());
+    }
     fprintf(stderr, "%s", entry.c_str());
     fflush(stderr);
   }
@@ -245,6 +281,9 @@ bool InitLogging() {
     if (cmd_line->HasSwitch("append-log")) {
         logMode = FILE_PATH_LITERAL("a");
     }
+  if (cmd_line->HasSwitch("readable-timestamp")) {
+    readable_timestamp = true;
+  }
 #if defined(OS_WIN)
     FILE* redir_stderr = _wfreopen(log_path.value().c_str(), logMode, stderr);
 #else

chrome/test/chromedriver/server/chromedriver_server.cc

@@ -427,6 +427,8 @@ int main(int argc, char *argv[]) {
         "whitelisted-ips",
             "comma-separated whitelist of remote IP addresses "
             "which are allowed to connect to ChromeDriver",
+        "readable-timestamp",
+            "add readable timestamps to log",
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
         "disable-dev-shm-usage",
             "do not use /dev/shm "

chrome/test/chromedriver/server/server.py

@@ -34,6 +34,7 @@ class Server(object):
     if log_path:
       chromedriver_args.extend(['--log-path=%s' % log_path])
       chromedriver_args.extend(['--append-log'])
+      chromedriver_args.extend(['--readable-timestamp'])
       if verbose:
         chromedriver_args.extend(['--verbose',
                                   '--vmodule=*/chrome/test/chromedriver/*=3'])