Update the lint metrics to match agains the rule URL rather than a prefix on the lint rule

Signed-off-by: Talon Bowler <[email protected]>

Author: daghack

util/progress/metricwriter.go

@@ -446,14 +446,22 @@ func newLintMetricRecorder(meter metric.Meter, attrs attribute.Set) *lintMetricR
 	return mr
 }
 
+func kebabToCamel(s string) string {
+	words := strings.Split(s, "-")
+	for i, word := range words {
+		words[i] = strings.Title(word)
+	}
+	return strings.Join(words, "")
+}
+
 func (mr *lintMetricRecorder) Record(ss *client.SolveStatus) {
 	for _, warning := range ss.Warnings {
-		m := reLintMessage.FindSubmatch(warning.Short)
+		m := reLintMessage.FindSubmatch([]byte(warning.URL))
 		if m == nil {
 			continue
 		}
 
-		ruleName := string(m[1])
+		ruleName := kebabToCamel(string(m[1]))
 		mr.Count.Add(context.Background(), 1,
 			metric.WithAttributeSet(mr.Attributes),
 			metric.WithAttributes(
@@ -464,6 +472,6 @@ func (mr *lintMetricRecorder) Record(ss *client.SolveStatus) {
 }
 
 var (
-	reLintMessage        = regexp.MustCompile(`^Lint Rule '(\w+)':`)
+	reLintMessage        = regexp.MustCompile(`^https://docs.docker.com/go/dockerfile/rule/([\w|-]+)/`)
 	lintRuleNameProperty = attribute.Key("lint.rule.name")
 )