Don't report android device port paths.

infra/services/sysmon/android_device_metrics.py

 # Copyright (c) 2016 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 json
 import logging
 import os
+import re
 import socket
 import time
 
 
 from infra_libs import ts_mon
 from infra_libs.ts_mon.common import interface
 from infra_libs.ts_mon.common import targets
 
 
 ANDROID_DEVICE_FILE_VERSION = 1
 
 ANDROID_PREVIOUS_DEVICE_FILE_VERSION = ANDROID_DEVICE_FILE_VERSION - 1
 ANDROID_DEVICE_FILE = os.path.join(os.path.expanduser('~'),
                                    'android_device_status.json')
 
 # Don't read a file older than this many seconds.
 ANDROID_DEVICE_FILE_STALENESS_S = 120
 
+PORT_PATH_RE = re.compile(r'\d+\/\d+')
+
 
 cpu_temp = ts_mon.FloatMetric('dev/cpu/temperature',
                               description='device CPU temperature in deg C')
 batt_temp = ts_mon.FloatMetric('dev/battery/temperature',
                                description='battery temperature in deg C')
 batt_charge = ts_mon.FloatMetric('dev/battery/charge',
                                  description='percentage charge of battery')
 dev_status = ts_mon.StringMetric('dev/status',
                                  description='operational state of device')
 dev_type = ts_mon.StringMetric('dev/type',
                                 description='device hardware or type')
 dev_os = ts_mon.StringMetric('dev/os',
                              description='operating system of the device')
 dev_uptime = ts_mon.FloatMetric('dev/device_uptime',
                                 description='device uptime in seconds')
 
 metric_read_status = ts_mon.StringMetric(
     'dev/android_device_metric_read/status',
     description='status of the last metric read')
 
 
 def get_device_statuses(device_file=ANDROID_DEVICE_FILE, now=None):
   now = now or time.time()
   devices = _load_android_device_file(device_file, now)
   if not devices:
     return
 
   for device_name, device in devices.iteritems():
+    if PORT_PATH_RE.match(device_name):
+      logging.warning('Found port path %s as device id. Skipping.',

[ghost stip (do not use), 2016/06/01 18:03:37]

interesting. when would this come up instead of device? (I guess that might be a
swarming thing?) if we drop it, are we losing data?

[bpastene, 2016/06/01 21:43:30]

I imagine it happens when there's a protocol/usb failure with the device. It
happens a bunch to this guy (look at all the USBErrorIO errors):
https://chromium-swarm.appspot.com/restricted/bot/build342-m4
When it does happen, the only data we have is 'status: unavailable', which we're
unable to even map to a specific device id. So no, we are not.

+                      device_name)
+      continue
+
     fields = {'device_id': device_name}
 
     # Fields with special handling.
 
     build = device.get('build', {})
     d_type = build.get('build_product',
                        build.get('product.board',
                                  build.get('product.device')))
 
     battery_temp = device.get('battery', {}).get('temperature')
@@ skipping 50 matching lines @@
   timestamp = json_data.get('timestamp', 0)
   if now >= timestamp + ANDROID_DEVICE_FILE_STALENESS_S:
     metric_read_status.set('stale_file')
     logging.error('Android device file %s is %ss stale (max %ss)',
                   device_file, now - timestamp,
                   ANDROID_DEVICE_FILE_STALENESS_S)
     return []
 
   metric_read_status.set('good')
   return json_data.get('devices', [])