2nd commit added back span.messages_count