instrumentation.logging refactoring
unittests reflect intended API usage