---

dietervdw-spotify · sduskis · commit 4f2b0aa2baee · 2019-03-19T14:40:12.000-04:00
yaml --- r: 18637 b: refs/heads/autosynth-monitoring c: e9ed7b0 h: refs/heads/master i: 18635: 150534f
diff --git a/[refs] b/[refs]
@@ -114,7 +114,7 @@ refs/tags/v0.66.0: ed6a3f57cbdaa20339a1995f7d7d53b172a5b8ef
 refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: afe19e1678334117f3daf13b968b667857f7c8ca
 refs/heads/autosynth-container: f6384095f50b31bfc8208542a49181e158d3681c
-refs/heads/autosynth-monitoring: 6268cd1224257a4b1c9e9113168f1873361e8ac3
+refs/heads/autosynth-monitoring: e9ed7b0fba36cbe562cba08500bb4ae4a451040b
 refs/heads/autosynth-pubsub: fd363d13793a853214eb8193c922b28c54e7a6b3
 refs/heads/autosynth-video-intelligence: e44c9746407fe00fac42e1bb10ac50f493dd37b0
 refs/heads/autosynth-vision: b8e47d76578b5f150ef530072ea7e485e2b02ca0
diff --git a/branches/autosynth-monitoring/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/branches/autosynth-monitoring/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/autosynth-monitoring/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/branches/autosynth-monitoring/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");
