From 141f7275ef16affe312f12e5487e1a5aefa8eab8 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 14:05:11 +0100 Subject: [PATCH] Add missing setter for gcp logger. --- .../kokuwa/micronaut/logging/layout/GcpJsonLayout.java | 8 ++++++++ .../kokuwa/micronaut/logging/mdc/MDCTurboFilter.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java index d2bf04a..139607c 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java +++ b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java @@ -56,4 +56,12 @@ public class GcpJsonLayout extends JsonLayout { map.put("serviceContext", serviceContext); } } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public void setServiceVersion(String serviceVersion) { + this.serviceVersion = serviceVersion; + } } diff --git a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java index c6f01b1..db4d805 100644 --- a/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java +++ b/src/main/java/io/kokuwa/micronaut/logging/mdc/MDCTurboFilter.java @@ -50,7 +50,13 @@ public class MDCTurboFilter extends TurboFilter { } @Override - public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { + public FilterReply decide( + Marker marker, + Logger logger, + Level eventLevel, + String format, + Object[] params, + Throwable t) { if (logger == null || !isStarted()) { return FilterReply.NEUTRAL; @@ -67,6 +73,6 @@ public class MDCTurboFilter extends TurboFilter { return FilterReply.NEUTRAL; } - return level.isGreaterOrEqual(this.level) ? FilterReply.ACCEPT : FilterReply.NEUTRAL; + return eventLevel.isGreaterOrEqual(this.level) ? FilterReply.ACCEPT : FilterReply.NEUTRAL; } }