safest EOL detection

newrelic · Oct 20, 2022 · 5f6ebd8 · 5f6ebd8
1 parent 373f699
commit 5f6ebd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/v3/integrations/logcontext-v2/zerologWriter/zerolog-writer.go b/v3/integrations/logcontext-v2/zerologWriter/zerolog-writer.go
@@ -123,7 +123,7 @@ func getKey(p []byte, indx int) (string, int) {
 }
 
 func isEOL(p []byte, i int) bool {
-	return p[i] == '}' && i+1 < len(p) && p[i+1] == '\n'
+	return p[i] == '}' && i+2 == len(p)
 }
 
 func getStringValue(p []byte, indx int) (string, int) {

diff --git a/v3/integrations/logcontext-v2/zerologWriter/zerolog-writer_test.go b/v3/integrations/logcontext-v2/zerologWriter/zerolog-writer_test.go
@@ -164,9 +164,9 @@ func TestParseLogDataEscapes(t *testing.T) {
 			`{"level":"info","message":"escape quote,\",\" hi"}`,
 		},
 		{
-			"escape bracket,\"}\" hi",
+			"escape bracket,\"}\n hi",
 			"info",
-			`{"level":"info","message":"escape bracket,\"}\" hi"}`,
+			`{"level":"info","message":"escape bracket,\"}\n hi"}`,
 		},
 	}