Skip to content

Commit 2cc02e5

Browse files
committed
add key replacement
1 parent 6eb0f8e commit 2cc02e5

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

java-sdk-logging/logback-extension/src/main/java/com/google/api/logging/SDKLoggingMdcJsonProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public void writeTo(JsonGenerator generator, ILoggingEvent event) throws IOExcep
6565
continue;
6666
}
6767

68+
fieldName = getMdcKeyFieldNames().getOrDefault(entry.getKey(), fieldName);
6869
if (!hasWrittenStart && getFieldName() != null) {
6970
generator.writeObjectFieldStart(getFieldName());
7071
hasWrittenStart = true;

java-sdk-logging/logback-extension/src/test/java/com/google/api/logging/SDKLoggingMdcJsonProviderTest.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,25 @@ void testWriteToJsonTreeIncludedKey() throws IOException {
173173
verify(generator, never()).writeObject(anyString());
174174
}
175175

176+
@Test
177+
void testWriteToJsonTreeReplacedKey() throws IOException {
178+
mdc.put(
179+
"json1",
180+
"{\n"
181+
+ " \"@version\": \"1\",\n"
182+
+ " \"textPayload\": \"Received response\",\n"
183+
+ " \"response.payload\": {\n"
184+
+ " \"name\": \"example\",\n"
185+
+ " \"state\": \"ACTIVE\"\n"
186+
+ " }\n"
187+
+ "}");
188+
provider.addMdcKeyFieldName("json1=new_json");
189+
provider.writeTo(generator, event);
190+
verify(generator, times(1)).writeFieldName("new_json");
191+
verify(generator, times(1)).writeTree(any(JsonNode.class));
192+
verify(generator, never()).writeObject(anyString());
193+
}
194+
176195
@Test
177196
void testWriteToJsonTreeExcludedKey() throws IOException {
178197
mdc.put(

0 commit comments

Comments
 (0)