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

client/third_party/infra_libs/ts_mon/config.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 json
 import logging
 import os
 import socket
 import sys
 import urlparse
@@ skipping 225 matching lines @@
 
   if endpoint.startswith('file://'):
     interface.state.global_monitor = monitors.DebugMonitor(
         endpoint[len('file://'):])
   elif endpoint.startswith('pubsub://'):
     if credentials:
       url = urlparse.urlparse(endpoint)
       project = url.netloc
       topic = url.path.strip('/')
       interface.state.global_monitor = monitors.PubSubMonitor(
-          credentials, project, topic, use_instrumented_http=True,
-          ca_certs=args.ts_mon_ca_certs)
+          monitors.CredentialFactory.from_string(credentials), project, topic,
+          use_instrumented_http=True, ca_certs=args.ts_mon_ca_certs)
     else:
       logging.error('ts_mon monitoring is disabled because credentials are not '
                     'available')
   elif endpoint.startswith('https://'):
     interface.state.global_monitor = monitors.HttpsMonitor(
-        endpoint, credentials, ca_certs=args.ts_mon_ca_certs)
+        endpoint, monitors.CredentialFactory.from_string(credentials),
+        ca_certs=args.ts_mon_ca_certs)
   elif endpoint.lower() == 'none':
     logging.info('ts_mon monitoring has been explicitly disabled')
   else:
     logging.error('ts_mon monitoring is disabled because the endpoint provided'
                   ' is invalid or not supported: %s', endpoint)
 
   interface.state.flush_mode = args.ts_mon_flush
   interface.state.use_new_proto = use_new_proto
 
   if args.ts_mon_flush == 'auto':
     interface.state.flush_thread = interface._FlushThread(
         args.ts_mon_flush_interval_secs)
     interface.state.flush_thread.start()
 
   standard_metrics.init()