Refactor metrics producer/consumer
Add dummy threshold crossing on extra metrics.

M.