Similar to what we do with `ApplicationEvent`s, we should add the `requestId` if available to the event.