Minor cleanup.

Give different file extensions to merged and raw metrics files.
Drop the duplicate trace root client spans.
Correct own time calculation.