rework tracing messages