Roll infra_libs and its dependencies to 066f135

client/third_party/infra_libs/ts_mon/common/metrics.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.
 
 """Classes representing individual metrics that can be sent."""
 
 import copy
 
 from infra_libs.ts_mon.protos.current import metrics_pb2
 from infra_libs.ts_mon.protos.new import metrics_pb2 as new_metrics_pb2
@@ skipping 101 matching lines @@
     data_set.annotations.unit = self._map_units_to_string(self._units)
 
     if self.is_cumulative():
       data_set.stream_kind = new_metrics_pb2.CUMULATIVE
     else:
       data_set.stream_kind = new_metrics_pb2.GAUGE
 
     self._populate_value_type(data_set)
     self._populate_field_descriptors(data_set, fields)
 
-  def _populate_data(self, data_set, start_time, end_time, fields, value):
-    """Add a new metrics_pb2.MetricsData to data_set
+  def _populate_data(self, data, start_time, end_time, fields, value):
+    """Populate a new metrics_pb2.MetricsData.
 
     Args:
-      data_set (new_metrics_pb2.MetricsDataSet): protocol buffer into
-        which to add the current metric values.
+      data_ (new_metrics_pb2.MetricsData): protocol buffer into
+        which to populate the current metric values.
       start_time (int): timestamp in microseconds since UNIX epoch.
     """
-    data = data_set.data.add()
     data.start_timestamp.seconds = int(start_time)
     data.end_timestamp.seconds = int(end_time)
 
     self._populate_fields_new(data, fields)
     self._populate_value_new(data, value)
 
-  def serialize_to(self, collection_pb, start_time, fields, value, target):
+  def serialize_to(self, metric_pb, start_time, fields, value, target):
     """Generate metrics_pb2.MetricsData messages for this metric.
 
     Args:
-      collection_pb (metrics_pb2.MetricsCollection): protocol buffer into which
-        to add the current metric values.
+      metric_pb (metrics_pb2.MetricsData): protocol buffer into which
+        to serialize the current metric values.
       start_time (int): timestamp in microseconds since UNIX epoch.
       target (Target): a Target to use.
     """
 
-    metric_pb = collection_pb.data.add()
     metric_pb.metric_name_prefix = interface.state.metric_name_prefix
     metric_pb.name = self._name
     if self._description is not None:
       metric_pb.description = self._description
     if self._units is not None:
       metric_pb.units = self._units
 
     self._populate_value(metric_pb, value, start_time)
     self._populate_fields(metric_pb, fields)
 
@@ skipping 386 matching lines @@
     if value.bucketer.width == 0:
       pb.exponential_buckets.growth_factor = value.bucketer.growth_factor
       pb.exponential_buckets.scale = 1.0
       pb.exponential_buckets.num_finite_buckets = (
           value.bucketer.num_finite_buckets)
     else:
       pb.linear_buckets.width = value.bucketer.width
       pb.linear_buckets.offset = 0.0
       pb.linear_buckets.num_finite_buckets = value.bucketer.num_finite_buckets
 
-    # Copy the distribution bucket values.  Only include the finite buckets, not
-    # the overflow buckets on each end.
+    # Copy the distribution bucket values.  Include the overflow buckets on
+    # either end.
     pb.bucket_count.extend(
         value.buckets.get(i, 0) for i in
         xrange(0, value.bucketer.total_buckets))
 
     pb.count = value.count
     pb.mean = float(value.sum) / max(value.count, 1)
 
   def _populate_value_type(self, data_set_pb):
     data_set_pb.value_type = new_metrics_pb2.DISTRIBUTION
 
@@ skipping 104 matching lines @@
     MetricsDataUnits.KILOBYTES: 'kBy',
     MetricsDataUnits.MEGABYTES: 'MBy',
     MetricsDataUnits.GIGABYTES: 'GBy',
     MetricsDataUnits.KIBIBYTES: 'kiBy',
     MetricsDataUnits.MEBIBYTES: 'MiBy',
     MetricsDataUnits.GIBIBYTES: 'GiBy',
     MetricsDataUnits.AMPS: 'A',
     MetricsDataUnits.MILLIAMPS : 'mA',
     MetricsDataUnits.DEGREES_CELSIUS: 'Cel'
 }