refactored instrumenation and request to now take a connection rather than individual client id and endpoint