Refactoring for logrus formatting Upstream-commit: 170abb5f7cabf4921a378d76532e74a272fbe39c Component: engine