Promote 'model' from state to dimension for Macs.

appengine/swarming/swarming_bot/api/os_utilities.py

 # coding: utf-8
 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """OS specific utility functions.
 
 Includes code:
 - to declare the current system this code is running under.
 - to run a command on user login.
@@ skipping 920 matching lines @@
     if hidpi:
       dimensions[u'hidpi'] = hidpi
 
   machine_type = get_machine_type()
   if machine_type:
     dimensions[u'machine_type'] = [machine_type]
   if platforms.is_gce():
     dimensions[u'zone'] = [platforms.gce.get_zone()]
 
   if sys.platform == 'darwin':
+    model = platforms.osx.get_hardware_model_string()
+    if model:
+      dimensions[u'mac_model'] = [model]
+    xcode_versions = platforms.osx.get_xcode_versions()
+    if xcode_versions:
+      dimensions[u'xcode_version'] = xcode_versions
+
+    # iOS devices
     udids = platforms.osx.get_ios_device_ids()
     device_types = set()
     for udid in udids:
       version = platforms.osx.get_ios_version(udid)
       if version:
         dimensions[u'os'].append('iOS-%s' % version)
         dimensions[u'os'].sort()
       device_type = platforms.osx.get_ios_device_type(udid)
       if device_type:
         device_types.add(device_type)
     if device_types:
       dimensions[u'device'] = sorted(device_types)
-    dimensions[u'xcode_version'] = platforms.osx.get_xcode_versions()
 
   return dimensions
 
 
 def get_state():
   """Returns dict with a state of the bot reported to the server with each poll.
 
   Supposed to be use only for dynamic state that changes while bot is running.
 
   The server can not use this state for immediate scheduling purposes (use
@@ skipping 26 matching lines @@
     u'uptime': int(round(get_uptime())),
     u'user': getpass.getuser().decode('utf-8'),
   }
   if sys.platform in ('cygwin', 'win32'):
     state[u'cygwin'] = [sys.platform == 'cygwin']
   if sys.platform == 'win32':
     integrity = platforms.win.get_integrity_level()
     if integrity is not None:
       state[u'integrity'] = [integrity]
   if sys.platform == 'darwin':
-    model = platforms.osx.get_hardware_model_string()
-    if model:
-      state[u'model'] = model
     state[u'xcode'] = platforms.osx.get_xcode_state()
   if sys.platform == 'linux2':
     temp = platforms.linux.get_temperatures()
     if temp:
       state[u'temp'] = temp
 
   # Put an arbitrary limit on the amount of junk that can stay in TEMP.
   if nb_files_in_temp == 'N/A':
     state[u'quarantined'] = 'Failed to access TEMP (%s)' % tmpdir
   elif nb_files_in_temp > 1024:
@@ skipping 251 matching lines @@
 
 
 def trim_rolled_log(name):
   try:
     for item in glob.iglob('%s.??' % name):
       os.remove(item)
     for item in glob.iglob('%s.???' % name):
       os.remove(item)
   except Exception as e:
     logging.exception('trim_rolled_log(%s) failed: %s', name, e)