kokuwaio/micronaut-logging
1
0
Fork 0
Code Issues 1 Pull requests Releases 6 Activity

Bump to java 17 (micronaut dependency)

Browse source
This commit is contained in:
Stephan Schnabel 2023-07-02 20:25:55 +02:00
parent 1678eadac2
commit 8043c3eb6d
Signed by: stephan.schnabel
GPG key ID: E07AF5BA239FE543
8 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yaml vendored
View file

@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
cache: maven
- run: mvn $MAVEN_ARGS dependency:go-offline
- run: mvn $MAVEN_ARGS deploy

2
.github/workflows/pr.yaml vendored
View file

@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
cache: maven
- run: mvn $MAVEN_ARGS dependency:go-offline
- run: mvn $MAVEN_ARGS verify

2
.github/workflows/release.yaml vendored
View file

@ -22,7 +22,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
cache: maven
server-id: sonatype-nexus
server-username: SERVER_USERNAME

4
pom.xml
View file

@ -62,8 +62,8 @@
<!-- ============================== Build ================================ -->
<!-- ===================================================================== -->
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- ===================================================================== -->
<!-- ============================= Versions ============================== -->

35
src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java
View file

@ -30,12 +30,13 @@ public class RootAutoSelectAppenderAction extends Action {
private static final String APPENDER_GCP = "GCP";
private static final String LOGBACK_APPENDER = "LOGBACK_APPENDER";
private static final String LOGBACK_PATTERN = "LOGBACK_PATTERN";
private static final String LOGBACK_PATTERN_DEFAULT = "%cyan(%d{HH:mm:ss.SSS})"
+ " %gray(%-6.6thread)"
+ " %highlight(%-5level)"
+ " %magenta(%32logger{32})"
+ " %mdc"
+ " %msg%n";
private static final String LOGBACK_PATTERN_DEFAULT = """
%cyan(%d{HH:mm:ss.SSS}) \
%gray(%-6.6thread) \
%highlight(%-5level) \
%magenta(%32logger{32}) \
%mdc \
%msg%n""";
@Override
public void begin(SaxEventInterpretationContext ic, String name, org.xml.sax.Attributes attributes) {
@ -70,21 +71,15 @@ public class RootAutoSelectAppenderAction extends Action {
private void setAppender(Logger rootLogger, String appenderName) {
addInfo("Use appender: " + appenderName);
Layout<ILoggingEvent> layout;
switch (appenderName) {
case APPENDER_JSON:
layout = json();
break;
case APPENDER_GCP:
layout = gcp();
break;
case APPENDER_CONSOLE:
layout = console();
break;
default:
var layout = switch (appenderName) {
case APPENDER_JSON -> json();
case APPENDER_GCP -> gcp();
case APPENDER_CONSOLE -> console();
default -> {
addError("Appender " + appenderName + " not found. Using console ...");
layout = console();
}
yield console();
}
};
layout.start();
var encoder = new LayoutWrappingEncoder<ILoggingEvent>();

10
src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java
View file

@ -3,8 +3,6 @@ package io.kokuwa.micronaut.logging.http.mdc;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.reactivestreams.Publisher;
@ -33,14 +31,14 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
public static final String PREFIX = "logger.http.header";
public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before();
private final Set<String> headers;
private final List<String> headers;
public HeaderMdcFilter(
@Value("${" + PREFIX + ".names}") List<String> headers,
@Value("${" + PREFIX + ".prefix}") Optional<String> prefix,
@Value("${" + PREFIX + ".order}") Optional<Integer> order) {
super(order.orElse(DEFAULT_ORDER), prefix.orElse(null));
this.headers = headers.stream().map(String::toLowerCase).collect(Collectors.toSet());
this.headers = headers.stream().map(String::toLowerCase).toList();
log.info("Configured with header names {}", headers);
}
@ -48,9 +46,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
var mdc = new HashMap<String, String>();
for (var header : headers) {
request.getHeaders()
.getFirst(header)
.ifPresent(value -> mdc.put(header, String.valueOf(value)));
request.getHeaders().getFirst(header).ifPresent(value -> mdc.put(header, String.valueOf(value)));
}
return doFilter(request, chain, mdc);
}

2
src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java
View file

@ -90,7 +90,7 @@ public class JsonLayout extends LayoutBase<ILoggingEvent> {
var throwableProxy = value.getThrowableProxy();
if (throwableProxy != null) {
var ex = throwableHandlingConverter.convert(value);
if (ex != null && !ex.equals("")) {
if (ex != null && !ex.isEmpty()) {
map.put(fieldName, ex);
}
}

6
src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java
View file

@ -89,9 +89,9 @@ public class PathMdcFilterTest extends AbstractFilterTest {
@DisplayName("mdc: test for documentation example")
@Test
@Property(name = "logger.http.path.patterns", value = ""
+ "\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36}),"
+ "\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36})\\/configuration\\/(?<config>[a-z]+)")
@Property(name = "logger.http.path.patterns", value = """
\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36}),\
\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36})\\/configuration\\/(?<config>[a-z]+)""")
void mdcMatchExample() {
var uuid = UUID.randomUUID().toString();
assertContext(Map.of("gatewayId", uuid), "/gateway/" + uuid);