Merge "profcollect: Refactor tracing code to a util class" into main