From 6fa4a438a05a6310d7aa97900909d59020293aef Mon Sep 17 00:00:00 2001
From: William Banfield <4561443+williambanfield@users.noreply.github.com>
Date: Thu, 12 May 2022 13:50:45 -0400
Subject: [PATCH] Update scripts/metricsgen/metricsgen.go

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
---
 scripts/metricsgen/metricsgen.go | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/scripts/metricsgen/metricsgen.go b/scripts/metricsgen/metricsgen.go
index dc78bd238..5db28861f 100644
--- a/scripts/metricsgen/metricsgen.go
+++ b/scripts/metricsgen/metricsgen.go
@@ -270,22 +270,15 @@ func extractHelpMessage(cg *ast.CommentGroup) string {
 	if cg == nil {
 		return ""
 	}
-	var help string
-	for i, c := range cg.List {
-		str := strings.TrimPrefix(c.Text, "//")
-		if len(str) == 0 {
-			continue
-		}
-		mt := strings.TrimPrefix(str, "metrics:")
-		if len(mt) < len(str) {
-			return mt
-		}
-		help += strings.TrimPrefix(str, " ")
-		if i < len(cg.List)-1 {
-			help += " "
+	var help []string
+	for _, c := range cg.List {
+		mt := strings.TrimPrefix(str, "//metrics:")
+		if mt != c {
+			return strings.TrimSpace(mt)
 		}
+		help = append(help, strings.TrimSpace(strings.TrimPrefix(c, "//")))
 	}
-	return help
+	return strings.Join(help, " ")
 }
 
 func isMetric(e ast.Expr, mPkgName string) bool {