diff --git a/scripts/metricsgen/metricsgen.go b/scripts/metricsgen/metricsgen.go
index 872d5cc81..455e63e9e 100644
--- a/scripts/metricsgen/metricsgen.go
+++ b/scripts/metricsgen/metricsgen.go
@@ -272,11 +272,11 @@ func extractHelpMessage(cg *ast.CommentGroup) string {
 	}
 	var help []string
 	for _, c := range cg.List {
-		mt := strings.TrimPrefix(str, "//metrics:")
-		if mt != c {
+		mt := strings.TrimPrefix(c.Text, "//metrics:")
+		if mt != c.Text {
 			return strings.TrimSpace(mt)
 		}
-		help = append(help, strings.TrimSpace(strings.TrimPrefix(c, "//")))
+		help = append(help, strings.TrimSpace(strings.TrimPrefix(c.Text, "//")))
 	}
 	return strings.Join(help, " ")
 }
diff --git a/scripts/metricsgen/metricsgen_test.go b/scripts/metricsgen/metricsgen_test.go
index 5eda59832..a925b591d 100644
--- a/scripts/metricsgen/metricsgen_test.go
+++ b/scripts/metricsgen/metricsgen_test.go
@@ -158,7 +158,7 @@ func TestParseMetricsStruct(t *testing.T) {
 						TypeName:   "Counter",
 						FieldName:  "myCounter",
 						MetricName: "my_counter",
-						Labels:     "\"label1\",\"label2\",",
+						Labels:     "\"label1\",\"label2\"",
 					},
 				},
 			},