Revert of Add field_specs to all metrics in luci-py

client/third_party/infra_libs/ts_mon/common/interface.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.
 
 Usage:
   import argparse
   from infra_libs import ts_mon
 
@@ skipping 105 matching lines @@
   """Generate MetricsPayload for global_monitor.send()."""
   proto = new_metrics_pb2.MetricsPayload()
 
   # Key: Target, value: MetricsCollection.
   collections = {}
 
   # Key: (Target, metric name) tuple, value: MetricsDataSet.
   data_sets = {}
 
   count = 0
+  error_count = 0
   for (target, metric, start_time, end_time, fields_values
        ) in state.store.get_all():
     for fields, value in fields_values.iteritems():
       if count >= METRICS_DATA_LENGTH_LIMIT:
         yield proto
         proto = new_metrics_pb2.MetricsPayload()
         collections.clear()
         data_sets.clear()
         count = 0
 
       if target not in collections:
         collections[target] = proto.metrics_collection.add()
         target._populate_target_pb_new(collections[target])
       collection = collections[target]
 
       key = (target, metric.name)
       new_data_set = None
-      if key not in data_sets:
-        new_data_set = new_metrics_pb2.MetricsDataSet()
-        metric._populate_data_set(new_data_set)
+      try:
+        if key not in data_sets:
+            new_data_set = new_metrics_pb2.MetricsDataSet()
+            metric._populate_data_set(new_data_set, fields)
 
-      data = new_metrics_pb2.MetricsData()
-      metric._populate_data(data, start_time, end_time, fields, value)
+        data = new_metrics_pb2.MetricsData()
+        metric._populate_data(data, start_time, end_time, fields, value)
+      except errors.MonitoringError:
+        logging.exception('Failed to serialize a metric.')
+        error_count += 1
+        continue
 
       # All required data protos have been successfully populated. Now we can
       # insert them in serialized proto and bookeeping data structures.
       if new_data_set is not None:
         collection.metrics_data_set.add().CopyFrom(new_data_set)
         data_sets[key] = collection.metrics_data_set[-1]
       data_sets[key].data.add().CopyFrom(data)
       count += 1
 
   if count > 0:
     yield proto
 
+  if error_count:
+    raise errors.MonitoringFailedToFlushAllMetricsError(error_count)
+
 
 def _generate_proto():
   """Generate MetricsCollection for global_monitor.send()."""
   proto = metrics_pb2.MetricsCollection()
 
+  error_count = 0
   for target, metric, start_time, _, fields_values in state.store.get_all():
     for fields, value in fields_values.iteritems():
       if len(proto.data) >= METRICS_DATA_LENGTH_LIMIT:
         yield proto
         proto = metrics_pb2.MetricsCollection()
 
-      metrics_pb = metrics_pb2.MetricsData()
-      metric.serialize_to(metrics_pb, start_time, fields, value, target)
+      try:
+        metrics_pb = metrics_pb2.MetricsData()
+        metric.serialize_to(metrics_pb, start_time, fields, value, target)
+      except errors.MonitoringError:
+        error_count += 1
+        logging.exception('Failed to serialize a metric.')
+        continue
 
       proto.data.add().CopyFrom(metrics_pb)
 
   if len(proto.data) > 0:
     yield proto
 
+  if error_count:
+    raise errors.MonitoringFailedToFlushAllMetricsError(error_count)
+
 
 def register(metric):
   """Adds the metric to the list of metrics sent by flush().
 
   This is called automatically by Metric's constructor.
   """
   # If someone is registering the same metric object twice, that's okay, but
   # registering two different metric objects with the same metric name is not.
   for m in state.metrics.values():
     if metric == m:
@@ skipping 62 matching lines @@
             'Last monitoring flush took %f seconds (longer than '
             '--ts-mon-flush-interval-secs = %f seconds)',
             flush_duration, self.interval_secs)
         next_timeout = 0
 
   def stop(self):
     """Stops the background thread and performs a final flush."""
 
     self.stop_event.set()
     self.join()