v6.0.4
Refactor trace to take a pointer to an error instead of a closure (#23779)
add defer tc.Cleanup() (#17415)