Revert "remedy the line-wrap while exceeding 100 chars"

This reverts commit 892fb8ffa85016a63d7d00dd6f1abc58ccf034a2.
Revert "SPARK-900 Use coarser grained naming for metrics"

This reverts commit 4b68be5f3c0a251453c184b233b3ca490812dafd.
create metrics name manually.