---

dietervdw-spotify · sduskis · commit 4411a9fa65e9 · 2019-03-19T14:40:12.000-04:00
yaml --- r: 26055 b: refs/heads/pubsub-ordering-keys c: e9ed7b0 h: refs/heads/master i: 26053: 1c8f802 26051: 762a685 26047: 8cf7d3e
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 6268cd1224257a4b1c9e9113168f1873361e8ac3
+refs/heads/pubsub-ordering-keys: e9ed7b0fba36cbe562cba08500bb4ae4a451040b
 "refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/branches/pubsub-ordering-keys/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/pubsub-ordering-keys/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/branches/pubsub-ordering-keys/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");
