logging/instrumentation: address review comments, remove Instrumentation...

Reviewer: vaterlaus

Forgot that commit.