From ac3c7bf4753c89b21fecabd52efdf0d96b7e3894 Mon Sep 17 00:00:00 2001 From: Elena Felder Date: Tue, 19 May 2020 18:26:07 -0400 Subject: [PATCH] update test to retrieve json format (#2378) Same fix as #2377, but for logging sample test. The logging format switched from text to json in com.google.cloud.google-cloud-logging-logback:v0.117.0 (googleapis/java-logging-logback#43). This PR fixes the trace integration test by switching from reading textPayload to jsonPayload for verification of trace correlation to log. --- .../test/java/com.example/LoggingSampleApplicationTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/src/test/java/com.example/LoggingSampleApplicationTests.java b/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/src/test/java/com.example/LoggingSampleApplicationTests.java index 066a1593e0..48b0314732 100644 --- a/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/src/test/java/com.example/LoggingSampleApplicationTests.java +++ b/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/src/test/java/com.example/LoggingSampleApplicationTests.java @@ -16,6 +16,7 @@ package com.example; +import com.google.cloud.logging.Payload.JsonPayload; import java.time.Instant; import java.util.ArrayList; import java.util.List; @@ -108,7 +109,8 @@ public void testLogRecordedInStackDriver() { }); List logContents = logEntries.stream() - .map((logEntry) -> ((StringPayload) logEntry.getPayload()).getData()) + .map((logEntry) -> (String) ((JsonPayload) logEntry.getPayload()) + .getDataAsMap().get("message")) .collect(Collectors.toList()); assertThat(logContents).containsExactlyInAnyOrder(