Merge branch 'gk/tracing-optimization'

The tracing infrastructure has been optimized for cases where no
tracing is requested.

* gk/tracing-optimization:
trace: improve performance while category is disabled
trace: remove trace key normalization