Skip to content

Updated logback-spring.xml to fix system warnings, bump dependencies #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 3, 2025
Merged

Updated logback-spring.xml to fix system warnings, bump dependencies #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d000c1
Updated logback-spring.xml to fix system warnings
fshim Jun 2, 2025
b1a6eef
bump
fshim Jun 2, 2025
a438cec
bump
fshim Jun 2, 2025
f19c775
fix
fshim Jun 2, 2025
ed16f74
fix
fshim Jun 2, 2025
a4c6f72
bump dependencies
fshim Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
build:
uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2
uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
deploy:
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v3
secrets:
server-username: ${{ secrets.OSSRH_USERNAME }}
server-password: ${{ secrets.OSSRH_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>library-parent-pom</artifactId>
<version>2.0.1</version>
<version>3.0.1</version>
</parent>

<artifactId>shared-resources</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
<packaging>jar</packaging>

<name>Java shared resources</name>
Expand Down Expand Up @@ -42,13 +42,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>2.7.5</version>
<version>3.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>7.2</version>
<version>8.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
Expand Down
122 changes: 63 additions & 59 deletions src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,71 @@
<springProperty scope="context" name="logbackAppender" source="logback.appender" defaultValue="COLOR_CONSOLE"/>
<springProperty scope="context" name="loggingLevelRoot" source="logging.level.root" defaultValue="INFO"/>

<appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
<charset>${CONSOLE_LOG_CHARSET}</charset>
</encoder>
</appender>

<appender name="COLOR_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>
%black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx
</Pattern>
</layout>
</appender>

<appender name="JSON_K8S_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
<providers>
<mdc/>
<pattern>
<if condition='"${logbackAppender}".equals("COLOR_CONSOLE")'>
<then>
<appender name="COLOR_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
{
"@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}",
"@severity": "%level",
"thread_name": "%thread",
"logger_name": "%logger",
"message": "%message"
}
%black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx
</pattern>
</pattern>
<stackTrace>
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
<maxDepthPerThrowable>30</maxDepthPerThrowable>
<maxLength>2048</maxLength>
<shortenedClassNameLength>20</shortenedClassNameLength>
<exclude>^sun\.reflect\..*\.invoke</exclude>
<exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
<rootCauseFirst>true</rootCauseFirst>
</throwableConverter>
</stackTrace>
</providers>
</encoder>
</appender>
</encoder>
</appender>

<root level="${loggingLevelRoot}">
<if condition='"${logbackAppender}".equals("COLOR_CONSOLE")'>
<then>
<root level="${loggingLevelRoot}">
<appender-ref ref="COLOR_CONSOLE"/>
</then>
<else>
<if condition='"${logbackAppender}".equals("JSON_K8S_CONSOLE")'>
<then>
<appender-ref ref="JSON_K8S_CONSOLE"/>
</then>
<else>
<appender-ref ref="DEFAULT_CONSOLE"/>
</else>
</if>
</else>
</if>
</root>
</root>
</then>
</if>

<if condition='"${logbackAppender}".equals("DEFAULT_CONSOLE")'>
<then>
<appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
<charset>${CONSOLE_LOG_CHARSET}</charset>
</encoder>
</appender>

<root level="${loggingLevelRoot}">
<appender-ref ref="DEFAULT_CONSOLE"/>
</root>
</then>
</if>

<if condition='"${logbackAppender}".equals("JSON_K8S_CONSOLE")'>
<then>
<appender name="JSON_K8S_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
<providers>
<mdc/>
<pattern>
<pattern>
{
"@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}",
"@severity": "%level",
"thread_name": "%thread",
"logger_name": "%logger",
"message": "%message"
}
</pattern>
</pattern>
<stackTrace>
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
<maxDepthPerThrowable>30</maxDepthPerThrowable>
<maxLength>2048</maxLength>
<shortenedClassNameLength>20</shortenedClassNameLength>
<exclude>^sun\.reflect\..*\.invoke</exclude>
<exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
<rootCauseFirst>true</rootCauseFirst>
</throwableConverter>
</stackTrace>
</providers>
</encoder>
</appender>

<jmxConfigurator/>
</configuration>
<root level="${loggingLevelRoot}">
<appender-ref ref="JSON_K8S_CONSOLE"/>
</root>
</then>
</if>
</configuration>
Loading