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

appengine/swarming/swarming_bot/bot_code/bot_main.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Swarming bot main process.
 
 This is the program that communicates with the Swarming server, ensures the code
 is always up to date and executes a child process to run tasks and upload
 results back.
 
@@ skipping 91 matching lines @@
   },
 }
 
 ### Monitoring
 
 
 _bucketer = ts_mon.GeometricBucketer(growth_factor=10**0.07,
                                      num_finite_buckets=100)
 
 hooks_durations = ts_mon.CumulativeDistributionMetric(
-    'swarming/bots/hooks/durations', bucketer=_bucketer,
-    description='Duration of bot hook calls in ms',
+    'swarming/bots/hooks/durations',
+    'Duration of bot hook calls in ms', [
+        ts_mon.StringField('hookname'),
+        ts_mon.StringField('pool'),
+    ],
+    bucketer=_bucketer,
     units=ts_mon.MetricsDataUnits.MILLISECONDS)
 
 
 def _flatten_dimensions(dimensions):
   """Return a canonical string of flattened dimensions."""
   iterables = (['%s:%s' % (key, x) for x in values]
                for key, values in dimensions.iteritems()
                if key not in ('android_devices', 'id'))
   return '|'.join(sorted(itertools.chain(*iterables)))
 
@@ skipping 1092 matching lines @@
   error = None
   if len(args.unsupported) != 0:
     error = 'Unexpected arguments: %s' % args
   try:
     return _run_bot(error)
   finally:
     _call_hook_safe(
         True, bot.Bot(None, None, None, None, base_dir, None),
         'on_bot_shutdown')
     logging.info('main() returning')