Add support for repeated keys in TaskRequest.

appengine/swarming/event_mon_metrics.py

 # Copyright 2016 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.
 
 import logging
 import time
 
 import gae_event_mon
 
 from server import task_result
 
 
-DIMENSIONS = (
-    ('cores', int),
-    ('cpu', unicode),
-    ('device_os', unicode),
-    ('device_type', unicode),
-    ('gpu', unicode),
-    ('hidpi', unicode),
-    ('machine_type', unicode),
-    ('os', unicode),
-    ('pool', unicode),
-    ('xcode_version', unicode),
-    ('zone', unicode),
-)
+DIMENSIONS = {
+    'cores': int,
+    'cpu': unicode,
+    'device_os': unicode,
+    'device_type': unicode,
+    'gpu': unicode,
+    'hidpi': unicode,
+    'machine_type': unicode,
+    'os': unicode,
+    'pool': unicode,
+    'xcode_version': unicode,
+    'zone': unicode,
+}
 
 
 TAGS = {
     'build_id': ['buildnumber'],
     'buildername': ['buildername'],
     'codereview': ['rietveld'],
     'master': ['master'],
     'name': ['name'],
     'patch_project': ['patch_project'],
     'project': ['project'],
@@ skipping 47 matching lines @@
   if task_properties.cipd_input:
     cipd_proto = properties_proto.cipd_input
     cipd_proto.server = task_properties.cipd_input.server
 
     _cipd_package_to_proto(task_properties.cipd_input.client_package,
                            cipd_proto.client_package)
     for package in task_properties.cipd_input.packages:
       package_proto = cipd_proto.packages.add()
       _cipd_package_to_proto(package, package_proto)
 
-  for d, t in DIMENSIONS:
-    if d in task_properties.dimensions:
-      getattr(properties_proto.dimensions, d).append(
-          t(task_properties.dimensions[d]))
+  for key, value in task_properties.dimensions:
+    if key in DIMENSIONS:
+      getattr(properties_proto.dimensions, key).append(DIMENSIONS[key](value))
 
   if task_properties.execution_timeout_secs:
     properties_proto.execution_timeout_s = \
         task_properties.execution_timeout_secs
   if task_properties.grace_period_secs:
     properties_proto.grace_period_s = task_properties.grace_period_secs
   if task_properties.io_timeout_secs:
     properties_proto.io_timeout_s = task_properties.io_timeout_secs
   properties_proto.idempotent = task_properties.idempotent
 
   state_enum = event.proto.swarming_task_event.State.DESCRIPTOR.values_by_name
   if summary.state == task_result.State.COMPLETED:
     event.proto.swarming_task_event.state = state_enum['COMPLETED'].number
   elif summary.state == task_result.State.CANCELED:
     event.proto.swarming_task_event.state = state_enum['CANCELED'].number
   elif summary.state == task_result.State.BOT_DIED:
     event.proto.swarming_task_event.state = state_enum['BOT_DIED'].number
   elif summary.state == task_result.State.TIMED_OUT:
     event.proto.swarming_task_event.state = state_enum['TIMED_OUT'].number
   elif summary.state == task_result.State.EXPIRED:
     event.proto.swarming_task_event.state = state_enum['EXPIRED'].number
   else:
     logging.error('Unhandled task state %r', summary.state)
 
   event.proto.swarming_task_event.bot_id = summary.bot_id
   event.proto.swarming_task_event.bot_version = summary.bot_version
 
-  for d, t in DIMENSIONS:
+  for d, t in DIMENSIONS.iteritems():
     for v in summary.bot_dimensions.get(d, []):
       getattr(event.proto.swarming_task_event.bot_dimensions, d).append(t(v))
 
   for v in summary.server_versions:
     event.proto.swarming_task_event.server_versions.append(v)
 
   event.proto.swarming_task_event.internal_failure = summary.internal_failure
   if summary.exit_code is not None:
     event.proto.swarming_task_event.exit_code = summary.exit_code
   else:
@@ skipping 46 matching lines @@
     summary: TaskResultSummary object.
   """
   # Isolate rest of the app from monitoring pipeline issues. They should
   # not cause outage of swarming.
   try:
     event = gae_event_mon.Event('POINT')
     _task_summary_to_proto(summary, event)
     event.send()
   except Exception:
     logging.exception('Caught exception while sending event')