add the metrics only when there are non zero values

add the metrics only when there are non zero values #2950