Update infra_libs to 1.1.15 / 0b44aba87c1c6538439df6d24a409870810747ab

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 65 matching lines @@
   parser.add_argument(
       '--ts-mon-config-file',
       default=default_config_file,
       help='path to a JSON config file that contains suitable values for '
            '"endpoint" and "credentials" for this machine. This config file is '
            'intended to be shared by all processes on the machine, as the '
            'values depend on the machine\'s position in the network, IP '
            'whitelisting and deployment of credentials. (default: %(default)s)')
   parser.add_argument(
       '--ts-mon-endpoint',
-      help='url (including file://, pubsub://project/topic, https://) to post '
-           'monitoring metrics to. If set, overrides the value in '
-           '--ts-mon-config-file')
+      help='url (file:// or https://) to post monitoring metrics to. If set, '
+           'overrides the value in --ts-mon-config-file')
   parser.add_argument(
       '--ts-mon-credentials',
       help='path to a pkcs8 json credential file. If set, overrides the value '
            'in --ts-mon-config-file')
   parser.add_argument(
       '--ts-mon-ca-certs',
       help='path to file containing root CA certificates for SSL server '
            'certificate validation. If not set, a CA cert file bundled with '
            'httplib2 is used.')
   parser.add_argument(
@@ skipping 66 matching lines @@
       help='number (e.g. for replication) of this instance of this task '
            '(default: %(default)s)')
 
   parser.add_argument(
       '--ts-mon-metric-name-prefix',
       default='/chrome/infra/',
       help='metric name prefix for all metrics (default: %(default)s)')
 
   parser.add_argument(
       '--ts-mon-use-new-proto',
-      default=False, action='store_true',
-      help='use the new proto schema (default: false)')
+      default=True, action='store_true',
+      help='deprecated and ignored')
 
 
 def process_argparse_options(args):
   """Process command line arguments to initialize the global monitor.
 
   Also initializes the default target.
 
   Starts a background thread to automatically flush monitoring metrics if not
   disabled by command line arguments.
 
   Args:
     args (argparse.Namespace): the result of parsing the command line arguments
   """
   # Parse the config file if it exists.
   config = load_machine_config(args.ts_mon_config_file)
   endpoint = config.get('endpoint', '')
   credentials = config.get('credentials', '')
   autogen_hostname = config.get('autogen_hostname', False)
-  use_new_proto = config.get('use_new_proto', False)
 
   # Command-line args override the values in the config file.
   if args.ts_mon_endpoint is not None:
     endpoint = args.ts_mon_endpoint
   if args.ts_mon_credentials is not None:
     credentials = args.ts_mon_credentials
-  if args.ts_mon_use_new_proto:
-    use_new_proto = args.ts_mon_use_new_proto
 
   if args.ts_mon_target_type == 'device':
     hostname = args.ts_mon_device_hostname
     if args.ts_mon_autogen_hostname or autogen_hostname:
       hostname = 'autogen:' + hostname
     interface.state.target = targets.DeviceTarget(
         args.ts_mon_device_region,
         args.ts_mon_device_role,
         args.ts_mon_device_network,
         hostname)
@@ skipping 16 matching lines @@
         args.ts_mon_task_region,
         hostname,
         args.ts_mon_task_number)
 
   interface.state.metric_name_prefix = args.ts_mon_metric_name_prefix
   interface.state.global_monitor = monitors.NullMonitor()
 
   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(
-          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, 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()