We should align with upstream changes for logging in 1.35:
This would mostly just require wrapping context with named loggers at various points within the codebase. This would assist with long-running challenges around figuring out which component is emitting what log message.