Merge remote-tracking branch 'upstream/main' into feat/export-telemet…

…rygen-funcs-for-tests
open-telemetry · Jan 7, 2025 · 51a2557 · 51a2557
2 parents 1b25937 + 52aea84
commit 51a2557
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/exporter/logzioexporter/from_domain_test.go b/exporter/logzioexporter/from_domain_test.go
@@ -39,8 +39,10 @@ func TestFromDomainEmbedProcess(t *testing.T) {
 func loadModel(t *testing.T) ([]byte, []byte) {
 	inStr, err := os.ReadFile("./testdata/span.json")
 	require.NoError(t, err)
+	inStr = bytes.ReplaceAll(inStr, []byte("\r\n"), []byte("\n"))
 	outStr, err := os.ReadFile("./testdata/logziospan.json")
 	require.NoError(t, err)
+	outStr = bytes.ReplaceAll(outStr, []byte("\r\n"), []byte("\n"))
 	return inStr, outStr
 }