logging/instrumentation: address review comments, remove InstrumentationOptions