| Index: tools/telemetry/telemetry/value/list_of_scalar_values.py
|
| diff --git a/tools/telemetry/telemetry/value/list_of_scalar_values.py b/tools/telemetry/telemetry/value/list_of_scalar_values.py
|
| index 698957ad571e6a73aaf48d0b20572788af9af4f6..297ddbf00f6e4662f0f3dcf860feb2697c54c59a 100644
|
| --- a/tools/telemetry/telemetry/value/list_of_scalar_values.py
|
| +++ b/tools/telemetry/telemetry/value/list_of_scalar_values.py
|
| @@ -14,10 +14,11 @@ def _Mean(values):
|
|
|
| class ListOfScalarValues(value_module.Value):
|
| def __init__(self, page, name, units, values,
|
| - important=True, description=None, none_value_reason=None,
|
| + important=True, description=None,
|
| + interaction_record=None, none_value_reason=None,
|
| same_page_merge_policy=value_module.CONCATENATE):
|
| super(ListOfScalarValues, self).__init__(page, name, units, important,
|
| - description)
|
| + description, interaction_record)
|
| if values is not None:
|
| assert isinstance(values, list)
|
| assert len(values) > 0
|
| @@ -37,13 +38,15 @@ class ListOfScalarValues(value_module.Value):
|
| else:
|
| merge_policy = 'PICK_FIRST'
|
| return ('ListOfScalarValues(%s, %s, %s, %s, '
|
| - 'important=%s, description=%s, same_page_merge_policy=%s)') % (
|
| + 'important=%s, description=%s, interaction_record=%s, '
|
| + 'same_page_merge_policy=%s)') % (
|
| page_name,
|
| self.name,
|
| self.units,
|
| repr(self.values),
|
| self.important,
|
| self.description,
|
| + self.interaction_record,
|
| merge_policy)
|
|
|
| def GetBuildbotDataType(self, output_context):
|
| @@ -84,6 +87,8 @@ class ListOfScalarValues(value_module.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 ListOfScalarValues(**kwargs)
|
|
|
| @@ -101,7 +106,7 @@ class ListOfScalarValues(value_module.Value):
|
| none_value_reason=v0.none_value_reason)
|
|
|
| assert v0.same_page_merge_policy == value_module.CONCATENATE
|
| - return cls._MergeLikeValues(values, v0.page, v0.name)
|
| + return cls._MergeLikeValues(values, v0.page, v0.name, v0.interaction_record)
|
|
|
| @classmethod
|
| def MergeLikeValuesFromDifferentPages(cls, values,
|
| @@ -109,10 +114,10 @@ class ListOfScalarValues(value_module.Value):
|
| 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_values = []
|
| none_value_reason = None
|
| @@ -126,5 +131,6 @@ class ListOfScalarValues(value_module.Value):
|
| page, name, v0.units,
|
| merged_values,
|
| important=v0.important,
|
| + interaction_record=interaction_record,
|
| same_page_merge_policy=v0.same_page_merge_policy,
|
| none_value_reason=none_value_reason)
|
|
|