Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions spectator/meter/id.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,27 +143,28 @@ func (id *Id) WithTags(tags map[string]string) *Id {
}

func toSpectatorId(name string, tags map[string]string) string {
result := replaceInvalidCharacters(name)
var sb strings.Builder
writeSanitized(&sb, name)

// Append sanitized keys and values.
for k, v := range tags {
k = replaceInvalidCharacters(k)
v = replaceInvalidCharacters(v)
result += fmt.Sprintf(",%s=%s", k, v)
sb.WriteString(",")
writeSanitized(&sb, k)
sb.WriteString("=")
writeSanitized(&sb, v)
}

return result
return sb.String()
}

func replaceInvalidCharacters(input string) string {
var result strings.Builder
func writeSanitized(sb *strings.Builder, input string) {
for _, r := range input {
if !isValidCharacter(r) {
result.WriteRune('_')
sb.WriteRune('_')
} else {
result.WriteRune(r)
sb.WriteRune(r)
}
}
return result.String()
}

func isValidCharacter(r rune) bool {
Expand Down
49 changes: 49 additions & 0 deletions spectator/meter/id_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"fmt"
"reflect"
"strings"
"sync"
"testing"
)
Expand Down Expand Up @@ -143,3 +144,51 @@ func TestToSpectatorId_InvalidTags(t *testing.T) {
t.Errorf("Expected '%s' or '%s', got '%s'", expected1, expected2, result)
}
}

var benchName = "my.metric.with_a_fairly_long_name.and.some.invalid.chars!@#"
var benchTags = map[string]string{
"tag1": "value1",
"another_tag": "another_value_with_some_length",
"invalid-key!": "invalid-value@",
"tag4": "value4",
"last.tag": "final~value",
}

func BenchmarkToSpectatorId(b *testing.B) {
replaceInvalidCharacters := func(input string) string {
var result strings.Builder
for _, r := range input {
if !isValidCharacter(r) {
result.WriteRune('_')
} else {
result.WriteRune(r)
}
}
return result.String()

}
originalToSpectatorId := func(name string, tags map[string]string) string {
result := replaceInvalidCharacters(name)

for k, v := range tags {
k = replaceInvalidCharacters(k)
v = replaceInvalidCharacters(v)
result += fmt.Sprintf(",%s=%s", k, v)

}

return result
}

b.ReportAllocs()
for n := 0; n < b.N; n++ {
_ = originalToSpectatorId(benchName, benchTags)
}
}

func BenchmarkToSpectatorIdBuilder(b *testing.B) {
b.ReportAllocs()
for n := 0; n < b.N; n++ {
_ = toSpectatorId(benchName, benchTags)
}
}