Refactor request instrumentation and logging