| Index: telemetry/telemetry/value/merge_values.py
|
| diff --git a/telemetry/telemetry/value/merge_values.py b/telemetry/telemetry/value/merge_values.py
|
| index ef6d0ab7a97a712c4a1857b31d37c4c88010c257..0eb3302bbc72789cbf4b70091f7dd80a6f6d5aa0 100644
|
| --- a/telemetry/telemetry/value/merge_values.py
|
| +++ b/telemetry/telemetry/value/merge_values.py
|
| @@ -21,7 +21,11 @@ def DefaultKeyFunc(value):
|
| Returns:
|
| A comparable object used to group values.
|
| """
|
| - return value.name, value.tir_label
|
| + # Grouping keys is a dict but key funcs need to be hashable, so we transform
|
| + # it to a sorted tuple of tuples here.
|
| + grouping_keys_sorted = tuple(sorted(value.grouping_keys.iteritems()))
|
| + return ((('value_name', value.name), ('ue_stable_id', value.tir_label)) +
|
| + grouping_keys_sorted)
|
|
|
|
|
| def MergeLikeValuesFromSamePage(all_values, key_func=DefaultKeyFunc):
|
|
|