Merge e118d5e into 2640a6b

grafana · Sep 19, 2023 · 6b37dff · 6b37dff
2 parents 2640a6b + e118d5e
commit 6b37dff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/tests/cmd_run_test.go b/cmd/tests/cmd_run_test.go
@@ -1575,7 +1575,7 @@ func TestMetricNameWarning(t *testing.T) {
 	t.Log(stdout)
 
 	logEntries := ts.LoggerHook.Drain()
-	expectedMsg := `Metric name should only include ASCII letters, numbers and underscores. This name will stop working in `
+	expectedMsg := `Metric name should only include up to 128 ASCII letters, numbers and/or underscores.`
 	filteredEntries := testutils.FilterEntries(logEntries, logrus.WarnLevel, expectedMsg)
 	require.Len(t, filteredEntries, 2)
 	// we do it this way as ordering is not guaranteed

diff --git a/js/bundle.go b/js/bundle.go
@@ -46,8 +46,8 @@ type Bundle struct {
 // https://github.com/grafana/k6/issues/3065
 func (b *Bundle) checkMetricNamesForPrometheusCompatibility() {
 	const (
-		nameRegexString = "^[a-zA-Z_][a-zA-Z0-9_]{1,63}$"
-		badNameWarning  = "Metric name should only include ASCII letters, numbers and underscores. " +
+		nameRegexString = "^[a-zA-Z_][a-zA-Z0-9_]{1,128}$"
+		badNameWarning  = "Metric name should only include up to 128 ASCII letters, numbers and/or underscores. " +
 			"This name will stop working in k6 v0.48.0 (around December 2023)."
 	)