Plumb IterationInfo from telemetry to a diagnostic

tracing/tracing/metrics/metric_runner.py

Index: tracing/tracing/metrics/metric_runner.py
diff --git a/tracing/tracing/metrics/metric_runner.py b/tracing/tracing/metrics/metric_runner.py
index 910b7d66a335946e7a0b0510d0974d0e82389119..999e50711b6f314ca304de663bd992f201cf65b8 100644
--- a/tracing/tracing/metrics/metric_runner.py
+++ b/tracing/tracing/metrics/metric_runner.py
@@ -16,25 +16,28 @@ _METRIC_MAP_FUNCTION_NAME = 'metricMapFunction'
 def _GetMetricsDir():
   return os.path.dirname(os.path.abspath(__file__))
 
-def _GetMetricRunnerHandle(metric):
+def _GetMetricRunnerHandle(metric, iter_info):
   assert isinstance(metric, basestring)
   metrics_dir = _GetMetricsDir()
   metric_mapper_path = os.path.join(metrics_dir, _METRIC_MAP_FUNCTION_FILENAME)
 
   modules_to_load = [function_handle.ModuleToLoad(filename=metric_mapper_path)]
+  options = {'metric': metric, 'iterInfo': iter_info}
   map_function_handle = function_handle.FunctionHandle(
-      modules_to_load, _METRIC_MAP_FUNCTION_NAME, {'metric': metric})
+      modules_to_load, _METRIC_MAP_FUNCTION_NAME, options)
 
   return job_module.Job(map_function_handle, None)
 
-def RunMetric(filename, metric, extra_import_options=None):
-  result = RunMetricOnTraces([filename], metric, extra_import_options)
+def RunMetric(filename, metric, iter_info=None, extra_import_options=None):
+  result = RunMetricOnTraces([filename], metric, iter_info,
+                             extra_import_options)
   return result[filename]
 
-def RunMetricOnTraces(filenames, metric, extra_import_options=None):
+def RunMetricOnTraces(filenames, metric, iter_info=None,
+                      extra_import_options=None):
   trace_handles = [
       file_handle.URLFileHandle(f, 'file://%s' % f) for f in filenames]
-  job = _GetMetricRunnerHandle(metric)
+  job = _GetMetricRunnerHandle(metric, iter_info)
   runner = map_runner.MapRunner(
       trace_handles, job,
       extra_import_options=extra_import_options,