etrace now uses a log structure, rest was refactoring