Skip to content

Commit 2b26d95

Browse files
committed
fix: adapt for SL4J 1.x and 2.x
1 parent a82120c commit 2b26d95

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITComputeGoldenSignals.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,16 @@ private void verifyMetrics(boolean expectError) throws Exception {
538538
private void validateLogging(boolean expectError) {
539539
List<ILoggingEvent> computeEvents = new ArrayList<>();
540540
for (ILoggingEvent event : testAppender.events) {
541-
if (event.getKeyValuePairs() == null) {
542-
continue;
543-
}
544541
Map<String, String> mdc = new HashMap<>();
545-
for (KeyValuePair kvp : event.getKeyValuePairs()) {
546-
mdc.put(kvp.key, String.valueOf(kvp.value));
542+
if (event.getKeyValuePairs() != null) {
543+
for (KeyValuePair kvp : event.getKeyValuePairs()) {
544+
mdc.put(kvp.key, String.valueOf(kvp.value));
545+
}
546+
} else if (event.getMDCPropertyMap() != null) {
547+
mdc.putAll(event.getMDCPropertyMap());
548+
} else {
549+
logger.warn("Found log without KV pairs nor MDC Property Map: " + event);
550+
continue;
547551
}
548552
if (!"compute".equals(mdc.get("gcp.client.service"))) {
549553
continue;

0 commit comments

Comments
 (0)