Perform Minor Cleanups

Signed-off-by: Mahad Zaryab <[email protected]>

Author: mahadzaryab1

cmd/jaeger/internal/sanitizer/utf8.go

@@ -90,9 +90,6 @@ func sanitizeAttributes(attributes pcommon.Map) {
 		newVal := attributes.PutEmptyBytes(newKey)
 		newVal.Append(sanitized...)
 		i++
-	}
-
-	for k := range invalidKeys {
 		attributes.Remove(k)
 	}
 }

cmd/jaeger/internal/sanitizer/utf8_test.go

@@ -233,7 +233,8 @@ func TestUTF8Sanitizer_DoesNotSanitizeNonStringAttributeValue(t *testing.T) {
 		ResourceSpans().
 		AppendEmpty().
 		Resource().
-		Attributes().PutInt("key", 99)
+		Attributes().
+		PutInt("key", 99)
 	sanitizer := NewUTF8Sanitizer()
 	sanitized := sanitizer(traces)
 	value, ok := sanitized.
@@ -252,7 +253,8 @@ func TestUTF8Sanitizer_SanitizesNonStringAttributeValueWithInvalidKey(t *testing
 		ResourceSpans().
 		AppendEmpty().
 		Resource().
-		Attributes().PutInt(invalidUTF8(), 99)
+		Attributes().
+		PutInt(invalidUTF8(), 99)
 	sanitizer := NewUTF8Sanitizer()
 	sanitized := sanitizer(traces)
 	value, ok := sanitized.
@@ -268,6 +270,7 @@ func TestUTF8Sanitizer_SanitizesNonStringAttributeValueWithInvalidKey(t *testing
 func TestUTF8Sanitizer_SanitizesMultipleAttributesWithInvalidKeys(t *testing.T) {
 	k1 := fmt.Sprintf("%s-%d", invalidUTF8(), 1)
 	k2 := fmt.Sprintf("%s-%d", invalidUTF8(), 2)
+	k3 := fmt.Sprintf("%s-%d", invalidUTF8(), 3)
 	traces := ptrace.NewTraces()
 	attributes := traces.
 		ResourceSpans().
@@ -277,6 +280,7 @@ func TestUTF8Sanitizer_SanitizesMultipleAttributesWithInvalidKeys(t *testing.T)
 
 	attributes.PutStr(k1, "v1")
 	attributes.PutStr(k2, "v2")
+	attributes.PutStr(k3, "v3")
 
 	sanitizer := NewUTF8Sanitizer()
 	sanitized := sanitizer(traces)
@@ -297,4 +301,13 @@ func TestUTF8Sanitizer_SanitizesMultipleAttributesWithInvalidKeys(t *testing.T)
 		Get("invalid-tag-key-2")
 	require.True(t, ok)
 	require.EqualValues(t, getBytesValueFromString(fmt.Sprintf("%s:v2", k2)), value)
+
+	value, ok = sanitized.
+		ResourceSpans().
+		At(0).
+		Resource().
+		Attributes().
+		Get("invalid-tag-key-3")
+	require.True(t, ok)
+	require.EqualValues(t, getBytesValueFromString(fmt.Sprintf("%s:v3", k3)), value)
 }