Index: tools/telemetry/telemetry/results/json_output_formatter.py |
diff --git a/tools/telemetry/telemetry/results/json_output_formatter.py b/tools/telemetry/telemetry/results/json_output_formatter.py |
index 1b1496f4b46f6d387a965f500f40c2783870cdae..09e05a88eea951244f684de95cd7329e39d26cd3 100644 |
--- a/tools/telemetry/telemetry/results/json_output_formatter.py |
+++ b/tools/telemetry/telemetry/results/json_output_formatter.py |
@@ -6,9 +6,10 @@ import json |
from telemetry.results import output_formatter |
-def ResultsAsDict(res): |
+def ResultsAsDict(res, metadata): |
result_dict = { |
- 'format_version': '0.1', |
+ 'format_version': '0.2', |
+ 'benchmark_name': metadata.name, |
'summary_values': [v.AsDict() for v in res.all_summary_values], |
'per_page_values': [v.AsDict() for v in res.all_page_specific_values], |
'pages': dict((p.id, p.AsDict()) for p in _all_pages(res)) |
@@ -21,9 +22,15 @@ def _all_pages(res): |
return pages |
class JsonOutputFormatter(output_formatter.OutputFormatter): |
- def __init__(self, output_stream): |
+ def __init__(self, output_stream, metadata): |
super(JsonOutputFormatter, self).__init__(output_stream) |
+ self._metadata = metadata |
+ |
+ @property |
+ def metadata(self): |
+ return self._metadata |
def Format(self, page_test_results): |
- json.dump(ResultsAsDict(page_test_results), self.output_stream) |
+ json.dump(ResultsAsDict(page_test_results, self.metadata), |
+ self.output_stream) |
self.output_stream.write('\n') |