Add extra instrumentation to client