[Telemetry] Add interaction_record field to Value

tools/telemetry/telemetry/value/scalar.py

 # Copyright 2013 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 numbers
 
 from telemetry import value as value_module
 from telemetry.value import list_of_scalar_values
 from telemetry.value import none_values
 
 
 class ScalarValue(value_module.Value):
   def __init__(self, page, name, units, value, important=True,
-               description=None, none_value_reason=None):
+               description=None, interaction_record=None,
+               none_value_reason=None):
     """A single value (float or integer) result from a test.
 
     A test that counts the number of DOM elements in a page might produce a
     scalar value:
        ScalarValue(page, 'num_dom_elements', 'count', num_elements)
     """
-    super(ScalarValue, self).__init__(page, name, units, important, description)
+    super(ScalarValue, self).__init__(page, name, units, important, description,
+                                      interaction_record)
     assert value is None or isinstance(value, numbers.Number)
     none_values.ValidateNoneValueReason(value, none_value_reason)
     self.value = value
     self.none_value_reason = none_value_reason
 
   def __repr__(self):
     if self.page:
       page_name = self.page.url
     else:
       page_name = None
-    return 'ScalarValue(%s, %s, %s, %s, important=%s, description=%s)' % (
-      page_name,
-      self.name,
-      self.units,
-      self.value,
-      self.important,
-      self.description)
+    return ('ScalarValue(%s, %s, %s, %s, important=%s, description=%s, '
+            'interaction_record=%s') % (
+                page_name,
+                self.name,
+                self.units,
+                self.value,
+                self.important,
+                self.description,
+                self.interaction_record)
 
   def GetBuildbotDataType(self, output_context):
     if self._IsImportantGivenOutputIntent(output_context):
       return 'default'
     return 'unimportant'
 
   def GetBuildbotValue(self):
     # Buildbot's print_perf_results method likes to get lists for all values,
     # even when they are scalar, so list-ize the return value.
     return [self.value]
@@ skipping 17 matching lines @@
 
     return d
 
   @staticmethod
   def FromDict(value_dict, page_dict):
     kwargs = value_module.Value.GetConstructorKwArgs(value_dict, page_dict)
     kwargs['value'] = value_dict['value']
 
     if 'none_value_reason' in value_dict:
       kwargs['none_value_reason'] = value_dict['none_value_reason']
+    if 'interaction_record' in value_dict:
+      kwargs['interaction_record'] = value_dict['interaction_record']
 
     return ScalarValue(**kwargs)
 
   @classmethod
   def MergeLikeValuesFromSamePage(cls, values):
     assert len(values) > 0
     v0 = values[0]
-    return cls._MergeLikeValues(values, v0.page, v0.name)
+    return cls._MergeLikeValues(values, v0.page, v0.name, v0.interaction_record)
 
   @classmethod
   def MergeLikeValuesFromDifferentPages(cls, values,
                                         group_by_name_suffix=False):
     assert len(values) > 0
     v0 = values[0]
     name = v0.name_suffix if group_by_name_suffix else v0.name
-    return cls._MergeLikeValues(values, None, name)
+    return cls._MergeLikeValues(values, None, name, v0.interaction_record)
 
   @classmethod
-  def _MergeLikeValues(cls, values, page, name):
+  def _MergeLikeValues(cls, values, page, name, interaction_record):
     v0 = values[0]
     merged_value = [v.value for v in values]
     none_value_reason = None
     if None in merged_value:
       merged_value = None
       none_value_reason = none_values.MERGE_FAILURE_REASON
     return list_of_scalar_values.ListOfScalarValues(
         page, name, v0.units, merged_value, important=v0.important,
+        interaction_record=interaction_record,
         none_value_reason=none_value_reason)