openstack/deb-python-kafka
Code Issues Proposed changes

HOTFIX: Fix BrokerConnectionMetrics when sensors already exist (i.e., on reconnects)

Browse Source
This commit is contained in:
Dana Powers
2016-08-08 16:55:15 -07:00
parent 6a8f0412bc
commit b19c51b5d8
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kafka/conn.py
View File

@@ -905,50 +905,54 @@ class BrokerConnectionMetrics(object):
if not node_sensor: if not node_sensor:
metric_group_name = metric_group_prefix + '-node-metrics.' + node_str metric_group_name = metric_group_prefix + '-node-metrics.' + node_str
self.bytes_sent = metrics.sensor( bytes_sent = metrics.sensor(
node_str + '.bytes-sent', node_str + '.bytes-sent',
parents=[metrics.get_sensor('bytes-sent')]) parents=[metrics.get_sensor('bytes-sent')])
self.bytes_sent.add(metrics.metric_name( bytes_sent.add(metrics.metric_name(
'outgoing-byte-rate', metric_group_name, 'outgoing-byte-rate', metric_group_name,
'The average number of outgoing bytes sent per second.'), 'The average number of outgoing bytes sent per second.'),
Rate()) Rate())
self.bytes_sent.add(metrics.metric_name( bytes_sent.add(metrics.metric_name(
'request-rate', metric_group_name, 'request-rate', metric_group_name,
'The average number of requests sent per second.'), 'The average number of requests sent per second.'),
Rate(sampled_stat=Count())) Rate(sampled_stat=Count()))
self.bytes_sent.add(metrics.metric_name( bytes_sent.add(metrics.metric_name(
'request-size-avg', metric_group_name, 'request-size-avg', metric_group_name,
'The average size of all requests in the window.'), 'The average size of all requests in the window.'),
Avg()) Avg())
self.bytes_sent.add(metrics.metric_name( bytes_sent.add(metrics.metric_name(
'request-size-max', metric_group_name, 'request-size-max', metric_group_name,
'The maximum size of any request sent in the window.'), 'The maximum size of any request sent in the window.'),
Max()) Max())
self.bytes_received = metrics.sensor( bytes_received = metrics.sensor(
node_str + '.bytes-received', node_str + '.bytes-received',
parents=[metrics.get_sensor('bytes-received')]) parents=[metrics.get_sensor('bytes-received')])
self.bytes_received.add(metrics.metric_name( bytes_received.add(metrics.metric_name(
'incoming-byte-rate', metric_group_name, 'incoming-byte-rate', metric_group_name,
'Bytes/second read off node-connection socket'), 'Bytes/second read off node-connection socket'),
Rate()) Rate())
self.bytes_received.add(metrics.metric_name( bytes_received.add(metrics.metric_name(
'response-rate', metric_group_name, 'response-rate', metric_group_name,
'The average number of responses received per second.'), 'The average number of responses received per second.'),
Rate(sampled_stat=Count())) Rate(sampled_stat=Count()))
self.request_time = self.metrics.sensor( request_time = metrics.sensor(
node_str + '.latency', node_str + '.latency',
parents=[metrics.get_sensor('request-latency')]) parents=[metrics.get_sensor('request-latency')])
self.request_time.add(metrics.metric_name( request_time.add(metrics.metric_name(
'request-latency-avg', metric_group_name, 'request-latency-avg', metric_group_name,
'The average request latency in ms.'), 'The average request latency in ms.'),
Avg()) Avg())
self.request_time.add(metrics.metric_name( request_time.add(metrics.metric_name(
'request-latency-max', metric_group_name, 'request-latency-max', metric_group_name,
'The maximum request latency in ms.'), 'The maximum request latency in ms.'),
Max()) Max())
self.bytes_sent = metrics.sensor(node_str + '.bytes-sent')
self.bytes_received = metrics.sensor(node_str + '.bytes-received')
self.request_time = metrics.sensor(node_str + '.latency')
def _address_family(address): def _address_family(address):
""" """