Adding missing calls to dispose stuff in metrics and tracing