We are also tracing the messageIdBuilder - that's we moved it inside.