Roll infra_libs to 564aaf7480f24c90687df79d9cef910cc342a54d

client/third_party/infra_libs/ts_mon/common/metric_store.py

 # Copyright 2015 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 collections
 import copy
 import itertools
 import threading
 import time
 
@@ skipping 239 matching lines @@
 
   def iter_field_values(self, name):
     return itertools.chain.from_iterable(
         x.iteritems() for _, x in self._entry(name).values.iter_targets())
 
   def get_all(self):
     # Make a copy of the metric values in case another thread (or this
     # generator's consumer) modifies them while we're iterating.
     with self._thread_lock:
       values = copy.copy(self._values)
+      end_time = self._time_fn()
 
     for name, metric_values in values.iteritems():
       if name not in self._state.metrics:
         continue
       start_time = metric_values.start_time
       for target, fields_values in metric_values.values.iter_targets():
-        yield target, self._state.metrics[name], start_time, fields_values
+        yield (target, self._state.metrics[name], start_time, end_time,
+               fields_values)
 
   def set(self, name, fields, target_fields, value, enforce_ge=False):
     with self._thread_lock:
       if enforce_ge:
         old_value = self._entry(name).get_value(fields, target_fields, 0)
         if value < old_value:
           raise errors.MonitoringDecreasingValueError(name, old_value, value)
 
       self._entry(name).set_value(fields, target_fields, value)
 
@@ skipping 15 matching lines @@
 
   def reset_for_unittest(self, name=None):
     if name is not None:
       self._reset(name)
     else:
       for name in self._values.keys():
         self._reset(name)
 
   def _reset(self, name):
     self._values[name] = MetricValues(self, self._start_time(name))