Update infra_libs to 1.1.15 / 0b44aba87c1c6538439df6d24a409870810747ab

client/third_party/infra_libs/ts_mon/common/targets.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 the monitoring interface for tasks or devices."""
 
 
 class Target(object):
   """Abstract base class for a monitoring target.
 
   A Target is a "thing" that should be monitored, for example, a device or a
   process. The majority of the time, a single process will have only a single
   Target.
 
   Do not directly instantiate an object of this class.
   Use the concrete child classes instead:
   * TaskTarget to monitor a job or tasks running in (potentially) many places;
   * DeviceTarget to monitor a host machine that may be running a task.
   """
 
   def __init__(self):
     # Subclasses should list the updatable target fields here.
     self._fields = tuple()
 
-  def _populate_target_pb(self, metric):
-    """Populate the 'target' embedded message field of a metric protobuf."""
-    raise NotImplementedError()
-
-  def _populate_target_pb_new(self, collection_pb):
+  def populate_target_pb(self, collection_pb):
     """Populate the 'target' into a MetricsCollection."""
     raise NotImplementedError()
 
   def to_dict(self):
     """Return target field values as a dictionary."""
     return {field: getattr(self, field) for field in self._fields}
 
   def update(self, target_fields):
     """Update values of some target fields given as a dict."""
     for field, value in target_fields.iteritems():
@@ skipping 30 matching lines @@
     """
     super(DeviceTarget, self).__init__()
     self.region = region
     self.role = role
     self.network = network
     self.hostname = hostname
     self.realm = 'ACQ_CHROME'
     self.alertable = True
     self._fields = ('region', 'role', 'network', 'hostname')
 
-  def _populate_target_pb(self, metric):
-    """Populate the 'network_device' embedded message of a metric protobuf.
+  def populate_target_pb(self, collection):
+    """Populate the 'network_device' target into metrics_pb2.MetricsCollection.
 
     Args:
-      metric (metrics_pb2.MetricsData): the metric proto to be populated.
-    """
-    metric.network_device.metro = self.region
-    metric.network_device.role = self.role
-    metric.network_device.hostgroup = self.network
-    metric.network_device.hostname = self.hostname
-    metric.network_device.realm = self.realm
-    metric.network_device.alertable = self.alertable
-
-  def _populate_target_pb_new(self, collection):
-    """Populate the 'network_device' target into
-       new_metrics_pb2.MetricsCollection.
-    Args:
       collection (metrics_pb2.MetricsCollection): the collection proto to be
           populated.
     """
     collection.network_device.metro = self.region
     collection.network_device.role = self.role
     collection.network_device.hostgroup = self.network
     collection.network_device.hostname = self.hostname
     collection.network_device.realm = self.realm
     collection.network_device.alertable = self.alertable
 
@@ skipping 13 matching lines @@
     """
     super(TaskTarget, self).__init__()
     self.service_name = service_name
     self.job_name = job_name
     self.region = region
     self.hostname = hostname
     self.task_num = task_num
     self._fields = ('service_name', 'job_name', 'region',
                     'hostname', 'task_num')
 
-  def _populate_target_pb(self, metric):
-    """Populate the 'task' embedded message field of a metric protobuf.
-
-    Args:
-      metric (metrics_pb2.MetricsData): the metric proto to be populated.
-    """
-    metric.task.service_name = self.service_name
-    metric.task.job_name = self.job_name
-    metric.task.data_center = self.region
-    metric.task.host_name = self.hostname
-    metric.task.task_num = self.task_num
-
-  def _populate_target_pb_new(self, collection):
-    """Populate the 'task' target into new_metrics_pb2.MetricsCollection.
+  def populate_target_pb(self, collection):
+    """Populate the 'task' target into metrics_pb2.MetricsCollection.
 
     Args:
       collection (metrics_pb2.MetricsCollection): the collection proto to be
           populated.
     """
     collection.task.service_name = self.service_name
     collection.task.job_name = self.job_name
     collection.task.data_center = self.region
     collection.task.host_name = self.hostname
     collection.task.task_num = self.task_num