github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib: consistently use regexp.Regexp.ReplaceAllLiteralString instead of regexp.Regexp.ReplaceAllString in places where the replacement cannot contain matching group placeholders

Browse source
This commit is contained in:
Aliaksandr Valialkin 2024-07-17 12:18:38 +02:00
parent bdc0e688e8
commit 58a757cd01
No known key found for this signature in database
GPG key ID: 52C003EE2BCDB9EB
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/promrelabel/relabel.go
View file

@ -673,7 +673,7 @@ func SplitMetricNameToTokens(name string) []string {
var nonAlphaNumChars = regexp.MustCompile(`[^a-zA-Z0-9]`) var nonAlphaNumChars = regexp.MustCompile(`[^a-zA-Z0-9]`)
var labelNameSanitizer = bytesutil.NewFastStringTransformer(func(s string) string { var labelNameSanitizer = bytesutil.NewFastStringTransformer(func(s string) string {
return unsupportedLabelNameChars.ReplaceAllString(s, "_") return unsupportedLabelNameChars.ReplaceAllLiteralString(s, "_")
}) })
var unsupportedLabelNameChars = regexp.MustCompile(`[^a-zA-Z0-9_]`) var unsupportedLabelNameChars = regexp.MustCompile(`[^a-zA-Z0-9_]`)
@ -686,7 +686,7 @@ func SanitizeMetricName(value string) string {
} }
var metricNameSanitizer = bytesutil.NewFastStringTransformer(func(s string) string { var metricNameSanitizer = bytesutil.NewFastStringTransformer(func(s string) string {
return unsupportedMetricNameChars.ReplaceAllString(s, "_") return unsupportedMetricNameChars.ReplaceAllLiteralString(s, "_")
}) })
var unsupportedMetricNameChars = regexp.MustCompile(`[^a-zA-Z0-9_:]`) var unsupportedMetricNameChars = regexp.MustCompile(`[^a-zA-Z0-9_:]`)

2
lib/promscrape/discoveryutils/utils.go
View file

@ -20,7 +20,7 @@ func SanitizeLabelName(name string) string {
} }
var labelNamesSanitizer = bytesutil.NewFastStringTransformer(func(s string) string { var labelNamesSanitizer = bytesutil.NewFastStringTransformer(func(s string) string {
return invalidLabelCharRE.ReplaceAllString(s, "_") return invalidLabelCharRE.ReplaceAllLiteralString(s, "_")
}) })
var invalidLabelCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`) var invalidLabelCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)

6
lib/protoparser/datadogutils/datadogutils.go
View file

@ -44,9 +44,9 @@ func SanitizeName(name string) string {
} }
var namesSanitizer = bytesutil.NewFastStringTransformer(func(s string) string { var namesSanitizer = bytesutil.NewFastStringTransformer(func(s string) string {
s = unsupportedDatadogChars.ReplaceAllString(s, "_") s = unsupportedDatadogChars.ReplaceAllLiteralString(s, "_")
s = multiUnderscores.ReplaceAllString(s, "_") s = multiUnderscores.ReplaceAllLiteralString(s, "_")
s = underscoresWithDots.ReplaceAllString(s, ".") s = underscoresWithDots.ReplaceAllLiteralString(s, ".")
return s return s
}) })

4
lib/querytracer/tracer_test.go
View file

@ -221,7 +221,7 @@ func areEqualTracesSkipDuration(s1, s2 string) bool {
} }
func zeroDurationsInTrace(s string) string { func zeroDurationsInTrace(s string) string {
return skipDurationRe.ReplaceAllString(s, " 0ms: ") return skipDurationRe.ReplaceAllLiteralString(s, " 0ms: ")
} }
var skipDurationRe = regexp.MustCompile(" [0-9.]+ms: ") var skipDurationRe = regexp.MustCompile(" [0-9.]+ms: ")
@ -233,7 +233,7 @@ func areEqualJSONTracesSkipDuration(s1, s2 string) bool {
} }
func zeroJSONDurationsInTrace(s string) string { func zeroJSONDurationsInTrace(s string) string {
return skipJSONDurationRe.ReplaceAllString(s, `"duration_msec":0`) return skipJSONDurationRe.ReplaceAllLiteralString(s, `"duration_msec":0`)
} }
var skipJSONDurationRe = regexp.MustCompile(`"duration_msec":[0-9.]+`) var skipJSONDurationRe = regexp.MustCompile(`"duration_msec":[0-9.]+`)