Logdog for logcats

build/android/pylib/local/device/local_device_environment.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import logging
 import os
 import shutil
 import tempfile
 import threading
 
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_list
 from devil.android import device_utils
 from devil.android import logcat_monitor
+from devil.utils import cmd_helper
 from devil.utils import file_utils
 from devil.utils import parallelizer
 from pylib import constants
 from pylib.base import environment
 
 
 def _DeviceCachePath(device):
   file_name = 'device_cache_%s.json' % device.adb.GetDeviceSerial()
   return os.path.join(constants.GetOutDirectory(), file_name)
 
@@ skipping 10 matching lines @@
     self._devices = []
     self._concurrent_adb = args.enable_concurrent_adb
     self._enable_device_cache = args.enable_device_cache
     self._logcat_monitors = []
     self._logcat_output_dir = args.logcat_output_dir
     self._logcat_output_file = args.logcat_output_file
     self._max_tries = 1 + args.num_retries
     self._skip_clear_data = args.skip_clear_data
     self._target_devices_file = args.target_devices_file
     self._tool_name = args.tool
+    self._logdog_command = args.logdog_command.split()
+    self._logdog_stream = args.logdog_stream.split()
 
   #override
   def SetUp(self):
     device_arg = 'default'
     if self._target_devices_file:
       device_arg = device_list.GetPersistentDeviceList(
           self._target_devices_file)
       if not device_arg:
         logging.warning('No target devices specified. Falling back to '
                         'running on all available devices.')
@@ skipping 61 matching lines @@
   #override
   def TearDown(self):
     # Write the cache even when not using it so that it will be ready the first
     # time that it is enabled. Writing it every time is also necessary so that
     # an invalid cache can be flushed just by disabling it for one run.
     for d in self._devices:
       cache_path = _DeviceCachePath(d)
       with open(cache_path, 'w') as f:
         f.write(d.DumpCacheData())
         logging.info('Wrote device cache: %s', cache_path)
+    logging.info('Adding device serials to logcats')
     for m in self._logcat_monitors:
       m.Stop()
       m.Close()
+      add_device_args = ['sed', '-i', '-e',
+                         's/^/device({0}) /'.
+                         format(m._adb.GetDeviceSerial()),
+                         m.output_file]
+      cmd_helper.RunCmd(add_device_args)
     if self._logcat_output_file:
       file_utils.MergeFiles(
           self._logcat_output_file,
           [m.output_file for m in self._logcat_monitors])
       shutil.rmtree(self._logcat_output_dir)
+    if self._logdog_command and self._logdog_stream:
+      logging.info('NOTE: outputs below are specific to logdog.')
+#      task = str(os.environ['SWARMING_TASK_ID'])
+#      prefix = ['-prefix', 'android/swarming/logcats/task{0}'.format(task)]
+#      cmd = self._logdog_command + prefix + self._logdog_stream
+      cmd = self._logdog_command.split()
+      cmd_helper.RunCmd(cmd)
+      url_prefix = self._logdog_command[-4].replace('/', '%2F')
+      suffix = self._logdog_command[-1]
+      url_suffix = 'file:{0}'.format(suffix.replace('/', '_'))
+      url = 'https://luci-logdog-dev.appspot.com/v/?s=chromium%2F{0}%2F%2B%2F{1}'.format(url_prefix, url_suffix)

[ghost stip (do not use), 2016/07/20 22:24:23]

80 chars, and are we switching back to prod for this CL?

[nicholaslin, 2016/07/23 01:23:21]

I would assume so. Will talk to Dan later.

+      logging.info('Logcats are at %s', url)
 
   def BlacklistDevice(self, device, reason='local_device_failure'):
     device_serial = device.adb.GetDeviceSerial()
     if self._blacklist:
       self._blacklist.Extend([device_serial], reason=reason)
     with self._devices_lock:
       self._devices = [d for d in self._devices if str(d) != device_serial]