Skip to content

Commit 997e72d

Browse files
committed
write a newline
1 parent 1e895ef commit 997e72d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

java-sdk-logging/log4j2-extension/src/main/java/com/google/cloud/sdk/logging/SDKLoggingJsonLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public String toSerializable(LogEvent event) {
8585
}
8686
}
8787

88-
return gson.toJson(jsonMap);
88+
return String.format("%s\n", gson.toJson(jsonMap));
8989
}
9090

9191
private void extractNonMdc(LogEvent event, Map<String, Object> jsonMap) {

java-sdk-logging/log4j2-extension/src/test/java/com/google/cloud/sdk/logging/SDKLoggingJsonLayoutTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void init() {
6666
@Test
6767
void testToSerializableContainsNonMdcContents() {
6868
assertEquals(
69-
"{\"timestamp\":10000,\"level\":\"DEBUG\",\"logger_name\":\"com.example.Example\",\"message\":\"example message\"}",
69+
"{\"timestamp\":10000,\"level\":\"DEBUG\",\"logger_name\":\"com.example.Example\",\"message\":\"example message\"}\n",
7070
sdkLoggingJsonLayout.toSerializable(logEvent));
7171
}
7272

@@ -89,7 +89,7 @@ void testToSerializableInvalidJsonValueWriteString() {
8989
// the last colon is invalid.
9090
mdcMap.put("example key", "{key:value,jsonKey:{nestedKey:nestedValue,}}");
9191
assertEquals(
92-
"{\"timestamp\":10000,\"level\":\"DEBUG\",\"logger_name\":\"com.example.Example\",\"message\":\"example message\",\"example key\":\"{key:value,jsonKey:{nestedKey:nestedValue,}}\"}",
92+
"{\"timestamp\":10000,\"level\":\"DEBUG\",\"logger_name\":\"com.example.Example\",\"message\":\"example message\",\"example key\":\"{key:value,jsonKey:{nestedKey:nestedValue,}}\"}\n",
9393
sdkLoggingJsonLayout.toSerializable(logEvent));
9494
}
9595

@@ -99,7 +99,7 @@ void testToSerializableValidJsonValueWriteJson() {
9999
mdcMap.put("example key", "{key:value,jsonKey:{nestedKey:nestedValue}}");
100100
String log = sdkLoggingJsonLayout.toSerializable(logEvent);
101101
assertEquals(
102-
"{\"timestamp\":10000,\"level\":\"DEBUG\",\"logger_name\":\"com.example.Example\",\"message\":\"example message\",\"example key\":{\"key\":\"value\",\"jsonKey\":{\"nestedKey\":\"nestedValue\"}}}",
102+
"{\"timestamp\":10000,\"level\":\"DEBUG\",\"logger_name\":\"com.example.Example\",\"message\":\"example message\",\"example key\":{\"key\":\"value\",\"jsonKey\":{\"nestedKey\":\"nestedValue\"}}}\n",
103103
log);
104104
assertDoesNotThrow(() -> JsonParser.parseString(log));
105105
}

0 commit comments

Comments
 (0)