Refactor metric collection

This change adds a generic queue onto which metrics can be pushed. A
separate module removes metrics from the queue and adds them to Cloudwatch.
Since these are now separate ideas, we can easily change the consumer from
Cloudwatch to anything else.

This change maintains near feature parity (the only change is there is now
just one queue instead of two - not a big deal).

util/saas/cloudwatch.py

@@ -7,29 +7,29 @@ from threading import Thread
 
 logger = logging.getLogger(__name__)
 
-def get_queue(app):
+def send_cloudwatch(metrics, app):
   """
-  Returns a queue to a new CloudWatchSender.
+  Starts sending from metrics to a new CloudWatchSender.
   """
   access_key = app.config['CLOUDWATCH_AWS_ACCESS_KEY']
   secret_key = app.config['CLOUDWATCH_AWS_SECRET_KEY']
+  namespace = app.config['CLOUDWATCH_NAMESPACE']
 
-  queue = Queue()
-  sender = CloudWatchSender(queue, access_key, secret_key)
+  sender = CloudWatchSender(metrics, access_key, secret_key, namespace)
   sender.start()
-  return queue
 
 class CloudWatchSender(Thread):
   """
   CloudWatchSender loops indefinitely and pulls metrics off of a queue then sends it to CloudWatch.
   """
-  def __init__(self, request_queue, aws_access_key, aws_secret_key):
+  def __init__(self, metrics, aws_access_key, aws_secret_key, namespace):
     Thread.__init__(self)
     self.daemon = True
 
     self._aws_access_key = aws_access_key
     self._aws_secret_key = aws_secret_key
-    self._put_metrics_queue = request_queue
+    self._metrics = metrics
+    self._namespace = namespace
 
   def run(self):
     try:
@@ -39,9 +39,9 @@ class CloudWatchSender(Thread):
       logger.exception('Failed to connect to CloudWatch.')
 
     while True:
-      put_metric_args, kwargs = self._put_metrics_queue.get()
+      put_metric_args, kwargs = self._metrics.get()
       logger.debug('Got queued put metrics request.')
       try:
-        connection.put_metric_data(*put_metric_args, **kwargs)
+        connection.put_metric_data(self._namespace, *put_metric_args, **kwargs)
       except:
         logger.exception('Failed to write to CloudWatch')

util/saas/metricqueue.py

@@ -0,0 +1,11 @@
+from Queue import Queue
+
+class MetricQueue(object):
+  def __init__(self):
+    self._queue = Queue()
+
+  def put(self, *args, **kwargs):
+    self._queue.put((args, kwargs))
+
+  def get(self):
+    return self._queue.get()

util/saas/queuemetrics.py

@@ -1,56 +0,0 @@
-import logging
-
-from util.saas.cloudwatch import get_queue
-
-
-logger = logging.getLogger(__name__)
-
-
-class NullReporter(object):
-  def report(self, *args):
-    pass
-
-
-class CloudWatchReporter(object):
-  """ CloudWatchReporter reports work queue metrics to CloudWatch """
-  def __init__(self, request_queue, namespace, need_capacity_name, build_percent_name):
-    self._namespace = namespace
-    self._need_capacity_name = need_capacity_name
-    self._build_percent_name = build_percent_name
-    self._put_metrics_queue = request_queue
-
-  def _send_to_queue(self, *args, **kwargs):
-    self._put_metrics_queue.put((args, kwargs))
-
-  def report(self, currently_processing, running_count, total_count):
-    logger.debug('Worker indicated %s running count and %s total count', running_count,
-                 total_count)
-
-    need_capacity_count = total_count - running_count
-    self._send_to_queue(self._namespace, self._need_capacity_name, need_capacity_count,
-                        unit='Count')
-
-    building_percent = 100 if currently_processing else 0
-    self._send_to_queue(self._namespace, self._build_percent_name, building_percent,
-                        unit='Percent')
-
-class QueueMetrics(object):
-  """
-  QueueMetrics initializes a reporter for recording metrics of work queues.
-  """
-  def __init__(self, app=None):
-    self._app = app
-    self._reporter = NullReporter()
-    if app is not None:
-      reporter_type = app.config.get('QUEUE_METRICS_TYPE', 'Null')
-      if reporter_type == 'CloudWatch':
-        namespace = app.config['QUEUE_METRICS_NAMESPACE']
-        req_capacity_name = app.config['QUEUE_METRICS_CAPACITY_SHORTAGE_NAME']
-        build_percent_name = app.config['QUEUE_METRICS_BUILD_PERCENT_NAME']
-
-        request_queue = get_queue(app)
-        self._reporter = CloudWatchReporter(request_queue, namespace, req_capacity_name,
-                                        build_percent_name)
-
-  def __getattr__(self, name):
-    return getattr(self._reporter, name, None)