Roll infra_libs and gae_ts_mon in luci-py, and add field_specs to all metrics

appengine/third_party/gae_ts_mon/shared.py

 # Copyright 2016 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 contextlib
 
 from google.appengine.api import modules
 from google.appengine.api import namespace_manager
 from google.appengine.ext import ndb
 
 from infra_libs.ts_mon.common import metrics
 
 REGION = 'appengine'
 PUBSUB_PROJECT = 'chrome-infra-mon-pubsub'
 PUBSUB_TOPIC = 'monacq'
 INSTANCE_NAMESPACE = 'ts_mon_instance_namespace'
 # Duration of inactivity to consider an instance dead.
 INSTANCE_EXPIRE_SEC = 30 * 60
 INSTANCE_EXPECTED_TO_HAVE_TASK_NUM_SEC = 5 * 60
 INTERNAL_CALLBACK_NAME = '__gae_ts_mon_callback'
 
 
 appengine_default_version = metrics.StringMetric(
     'appengine/default_version',
-    description='Name of the version currently marked as default.')
+    'Name of the version currently marked as default.',
+    None)
 started_counter = metrics.CounterMetric(
     'appengine/instances/started',
-    description='Count the number of GAE instance initializations.')
+    'Count the number of GAE instance initializations.',
+    None)
 shutdown_counter = metrics.CounterMetric(
     'appengine/instances/shutdown',
-    description='Count the number of GAE instance shutdowns.')
+    'Count the number of GAE instance shutdowns.',
+    None)
 expired_counter = metrics.CounterMetric(
     'appengine/instances/expired',
-    description=('Count the number of GAE instance expirations '
-                 'due to inactivity.'))
+    'Count the number of GAE instance expirations due to inactivity.',
+    None)
 
 
 global_metrics = {}
 global_metrics_callbacks = {}
 
 
 def reset_for_unittest():
   global global_metrics
   global global_metrics_callbacks
   global_metrics = {}
@@ skipping 66 matching lines @@
   try:
     namespace_manager.set_namespace(INSTANCE_NAMESPACE)
     yield
   finally:
     namespace_manager.set_namespace(previous_namespace)
 
 
 def get_instance_entity():
   with instance_namespace_context():
     return Instance.get_or_insert(instance_key_id())