XD-2107&1048: --nameExpression for metrics & --incrementExpression for agg-counter

indent problem