fixup! Update metrics/registry.go

grafana · Nov 15, 2023 · 498222e · 498222e
1 parent 111643a
commit 498222e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/tests/cmd_run_test.go b/cmd/tests/cmd_run_test.go
@@ -1571,7 +1571,7 @@ func TestMetricNameError(t *testing.T) {
 	t.Log(stdout)
 
 	logEntries := ts.LoggerHook.Drain()
-	expectedMsg := `Metric name should only include up to 128 ASCII letters, numbers and/or underscores.`
+	expectedMsg := `Metric names must only include up to 128 ASCII letters, numbers, or underscores`
 	filteredEntries := testutils.FilterEntries(logEntries, logrus.ErrorLevel, expectedMsg)
 	require.Len(t, filteredEntries, 1)
 	require.Contains(t, filteredEntries[0].Message, "'test counter'")

diff --git a/metrics/registry.go b/metrics/registry.go
@@ -28,7 +28,8 @@ func NewRegistry() *Registry {
 
 const (
 	nameRegexString = "^[a-zA-Z_][a-zA-Z0-9_]{1,128}$"
-	badNameWarning  = "Metric names should start with a letter or an underscore and only include up to 128 ASCII letters, numbers, or underscores."
+	badNameWarning  = "Metric names must only include up to 128 ASCII letters, numbers, or underscores " +
+		"and start with a letter or an underscore."
 )
 
 var compileNameRegex = regexp.MustCompile(nameRegexString)