---

dietervdw-spotify · sduskis · commit b2daf0a44648 · 2019-03-19T14:40:12.000-04:00
yaml --- r: 27399 b: refs/heads/mrschmidt-collectiongroup c: e9ed7b0 h: refs/heads/master i: 27397: 14e5d30 27395: 772afa7 27391: 6de99f4
diff --git a/[refs] b/[refs]
@@ -173,7 +173,7 @@ refs/heads/autosynth-securitycenter: f2f2feb8f3949c986d37e55cd23cdb0ce774f287
 refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
 refs/heads/cscc-samples: 620d105e6b574cfeeee04e413a157b7bd34ebc8b
 refs/heads/igorbernstein2-patch-1: f62464ee14df1e44a3b173cdc3976563d1b3078b
-refs/heads/mrschmidt-collectiongroup: 6268cd1224257a4b1c9e9113168f1873361e8ac3
+refs/heads/mrschmidt-collectiongroup: e9ed7b0fba36cbe562cba08500bb4ae4a451040b
 refs/heads/release-google-cloud-java-v0.83.0: 4b55ec1b81b3886ede61ae868391a3cdf7eed90e
 refs/heads/release-google-cloud-java-v0.83.1-SNAPSHOT: 8d6db7ee534d12b1df38d8cf314871df76f87577
 refs/heads/v4support: aa837fd70877f5a0628d8036e88952db035b792c
diff --git a/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
@@ -36,6 +36,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -232,6 +233,10 @@ private LogEntry logEntryFor(ILoggingEvent e) {
         .addLabel(LEVEL_NAME_KEY, level.toString())
         .addLabel(LEVEL_VALUE_KEY, String.valueOf(level.toInt()));
 
+    for (Map.Entry<String, String> entry : e.getMDCPropertyMap().entrySet()) {
+      builder.addLabel(entry.getKey(), entry.getValue());
+    }
+
     if (loggingEnhancers != null) {
       for (LoggingEnhancer enhancer : loggingEnhancers) {
         enhancer.enhanceLogEntry(builder);
diff --git a/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java
@@ -181,6 +181,36 @@ public void testDefaultWriteOptionsHasExpectedDefaults() {
     // assertThat(resourceArg.getValue()).isEqualTo(defaultWriteOptions[1]);
   }
 
+  @Test
+  public void testMdcValuesAreConvertedToLabels() {
+    LogEntry logEntry =
+        LogEntry.newBuilder(StringPayload.of("this is a test"))
+            .setTimestamp(100000L)
+            .setSeverity(Severity.INFO)
+            .setLabels(
+                new ImmutableMap.Builder<String, String>()
+                    .put("levelName", "INFO")
+                    .put("levelValue", String.valueOf(20000L))
+                    .put("mdc1", "value1")
+                    .put("mdc2", "value2")
+                    .build())
+            .build();
+    logging.setFlushSeverity(Severity.ERROR);
+    Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
+    logging.write(capture(capturedArgument), (WriteOption) anyObject(), (WriteOption) anyObject());
+    expectLastCall().once();
+    replay(logging);
+    Timestamp timestamp = Timestamp.ofTimeSecondsAndNanos(100000, 0);
+    LoggingEvent loggingEvent = createLoggingEvent(Level.INFO, timestamp.getSeconds());
+    loggingEvent.setMDCPropertyMap(ImmutableMap.of("mdc1", "value1", "mdc2", "value2"));
+    loggingAppender.start();
+    // info event does not get logged
+    loggingAppender.doAppend(loggingEvent);
+    verify(logging);
+    assertThat(capturedArgument.getValue().iterator().hasNext()).isTrue();
+    assertThat(capturedArgument.getValue().iterator().next()).isEqualTo(logEntry);
+  }
+
   private LoggingEvent createLoggingEvent(Level level, long timestamp) {
     LoggingEvent loggingEvent = new LoggingEvent();
     loggingEvent.setMessage("this is a test");
