Skip to content

Commit b26e414

Browse files
authored
[fix][jaeger-v2] Fix non-determinstic test in utf-8 sanitizer (jaegertracing#6095)
1 parent 35d4279 commit b26e414

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

cmd/jaeger/internal/sanitizer/utf8_test.go

+14-9
Original file line numberDiff line numberDiff line change
@@ -282,21 +282,26 @@ func TestUTF8Sanitizer_SanitizesMultipleAttributesWithInvalidKeys(t *testing.T)
282282

283283
sanitizer := NewUTF8Sanitizer()
284284
sanitized := sanitizer(traces)
285-
value, ok := sanitized.
285+
got := sanitized.
286286
ResourceSpans().
287287
At(0).
288288
Resource().
289-
Attributes().
289+
Attributes()
290+
require.Equal(t, 2, got.Len())
291+
292+
expectedValues := []pcommon.Value{
293+
getBytesValueFromString(fmt.Sprintf("%s:v1", k1)),
294+
getBytesValueFromString(fmt.Sprintf("%s:v2", k2)),
295+
}
296+
value, ok := got.
290297
Get("invalid-tag-key-1")
291298
require.True(t, ok)
292-
require.EqualValues(t, getBytesValueFromString(fmt.Sprintf("%s:v1", k1)), value)
299+
require.Contains(t, expectedValues, value)
300+
checked := value
293301

294-
value, ok = sanitized.
295-
ResourceSpans().
296-
At(0).
297-
Resource().
298-
Attributes().
302+
value, ok = got.
299303
Get("invalid-tag-key-2")
300304
require.True(t, ok)
301-
require.EqualValues(t, getBytesValueFromString(fmt.Sprintf("%s:v2", k2)), value)
305+
require.NotEqual(t, checked, value)
306+
require.Contains(t, expectedValues, value)
302307
}

0 commit comments

Comments
 (0)