use strings.Map instead of bytes.Map and add additional benchmark case

Signed-off-by: Callum Styan <[email protected]>
grafana · Nov 26, 2024 · da0dd5f · da0dd5f
1 parent 53927f1
commit da0dd5f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pkg/logql/log/pipeline.go b/pkg/logql/log/pipeline.go
@@ -1,7 +1,6 @@
 package log
 
 import (
-	"bytes"
 	"context"
 	"strings"
 	"sync"
@@ -231,7 +230,7 @@ func (p *streamPipeline) Process(ts int64, line []byte, structuredMetadata ...la
 	for i, lb := range structuredMetadata {
 		structuredMetadata[i].Name = prometheus.NormalizeLabel(lb.Name)
 		if strings.ContainsRune(structuredMetadata[i].Value, utf8.RuneError) {
-			structuredMetadata[i].Value = string(bytes.Map(removeInvalidUtf, []byte(structuredMetadata[i].Value)))
+			structuredMetadata[i].Value = strings.Map(removeInvalidUtf, structuredMetadata[i].Value)
 		}
 	}
 

diff --git a/pkg/logql/log/pipeline_test.go b/pkg/logql/log/pipeline_test.go
@@ -642,12 +642,18 @@ func Benchmark_Pipeline(b *testing.B) {
 			resLine, resLbs, resMatches = sp.Process(0, line, labels.Label{Name: "valid_name", Value: "foo"})
 		}
 	})
-	b.Run("pipeline string with invalid structured metadata", func(b *testing.B) {
+	b.Run("pipeline string with invalid structured metadata name", func(b *testing.B) {
 		b.ResetTimer()
 		for n := 0; n < b.N; n++ {
 			resLine, resLbs, resMatches = sp.Process(0, line, labels.Label{Name: "invalid-name", Value: "foo"}, labels.Label{Name: "other-invalid-name", Value: "foo"})
 		}
 	})
+	b.Run("pipeline string with invalid structured metadata value", func(b *testing.B) {
+		b.ResetTimer()
+		for n := 0; n < b.N; n++ {
+			resLine, resLbs, resMatches = sp.Process(0, line, labels.Label{Name: "valid_name", Value: "foo"}, labels.Label{Name: "valid_name_2", Value: "foo�"})
+		}
+	})
 
 	extractor, err := NewLineSampleExtractor(CountExtractor, stages, []string{"cluster", "level"}, false, false)
 	require.NoError(b, err)