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).
47 lines
1.4 KiB
Python
47 lines
1.4 KiB
Python
import logging
|
|
import boto
|
|
|
|
from Queue import Queue
|
|
from threading import Thread
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
def send_cloudwatch(metrics, app):
|
|
"""
|
|
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']
|
|
|
|
sender = CloudWatchSender(metrics, access_key, secret_key, namespace)
|
|
sender.start()
|
|
|
|
class CloudWatchSender(Thread):
|
|
"""
|
|
CloudWatchSender loops indefinitely and pulls metrics off of a queue then sends it to CloudWatch.
|
|
"""
|
|
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._metrics = metrics
|
|
self._namespace = namespace
|
|
|
|
def run(self):
|
|
try:
|
|
logger.debug('Starting CloudWatch sender process.')
|
|
connection = boto.connect_cloudwatch(self._aws_access_key, self._aws_secret_key)
|
|
except:
|
|
logger.exception('Failed to connect to CloudWatch.')
|
|
|
|
while True:
|
|
put_metric_args, kwargs = self._metrics.get()
|
|
logger.debug('Got queued put metrics request.')
|
|
try:
|
|
connection.put_metric_data(self._namespace, *put_metric_args, **kwargs)
|
|
except:
|
|
logger.exception('Failed to write to CloudWatch')
|