Merge change Iffbb6e55 into eclair

* changes:
  Make perf metrics collection & output via instrumentation simpler