Skip to content

Commit 347408a

Browse files
committed
replace log4j with slf4j and logback
unfortunately spring-boot hard code support for an older slf4j and logback, but this is isolated in scenario
1 parent b0c5622 commit 347408a

File tree

6 files changed

+36
-80
lines changed

6 files changed

+36
-80
lines changed

build-logic/src/main/kotlin/clusterless.java-common-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ dependencies {
111111

112112
val slf4j = "2.0.16"
113113
implementation("org.slf4j:slf4j-api:$slf4j")
114-
implementation("org.slf4j:slf4j-reload4j:$slf4j")
114+
115115
val logback = "1.5.16"
116116
implementation("ch.qos.logback:logback-classic:$logback")
117117
implementation("ch.qos.logback:logback-core:$logback")
@@ -122,9 +122,10 @@ dependencies {
122122
implementation("org.apache.logging.log4j:log4j-api:$log4j")
123123
implementation("org.apache.logging.log4j:log4j-core:$log4j")
124124
implementation("org.apache.logging.log4j:log4j-jul:$log4j")
125-
implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4j")
125+
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:$log4j")
126126
implementation("org.apache.logging.log4j:log4j-to-slf4j:$log4j")
127127
implementation("org.apache.logging.log4j:log4j-web:$log4j")
128+
implementation("org.apache.logging.log4j:log4j-layout-template-json:$log4j")
128129

129130
implementationAndTestFixture("com.jayway.jsonpath:json-path:2.9.0")
130131
implementationAndTestFixture("com.google.guava:guava:33.4.0-jre")
@@ -190,7 +191,6 @@ dependencies {
190191

191192
testImplementationAndTestFixture("ch.qos.logback:logback-classic:$logback")
192193
testImplementationAndTestFixture("ch.qos.logback:logback-core:$logback")
193-
testImplementationAndTestFixture("org.slf4j:slf4j-reload4j:$slf4j")
194194
}
195195
}
196196

clusterless-substrate-aws-lambda-arc/src/main/resources/log4j2.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

clusterless-substrate-aws-lambda-common/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ dependencies {
1818
api(project(":clusterless-substrate-aws-lambda-common-model"))
1919

2020
implementation("com.google.guava:guava")
21-
// implementation("com.cronutils:cron-utils")
2221

2322
implementation("com.fasterxml.jackson.core:jackson-core")
2423
implementation("com.fasterxml.jackson.core:jackson-databind")
@@ -30,14 +29,11 @@ dependencies {
3029
api("software.amazon.awssdk:eventbridge")
3130
api("software.amazon.awssdk:glue")
3231

32+
// https://docs.aws.amazon.com/lambda/latest/dg/java-logging.html#java-logging-log4j2
3333
api("com.amazonaws:aws-lambda-java-core")
34-
api("com.amazonaws:aws-lambda-java-log4j2") {
35-
exclude("org.apache.logging.log4j")
36-
exclude("log4j:log4j")
37-
exclude("org.slf4j:slf4j-log4j12")
38-
}
39-
40-
implementation("org.slf4j:slf4j-reload4j")
34+
api("com.amazonaws:aws-lambda-java-log4j2")
35+
implementation("org.apache.logging.log4j:log4j-slf4j2-impl")
36+
implementation("org.apache.logging.log4j:log4j-layout-template-json")
4137

4238
testFixturesImplementation(project(":clusterless-common"))
4339
testFixturesImplementation(project(":clusterless-model"))
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!--
2+
~ Copyright (c) 2023-2025 Chris K Wensel <chris@wensel.net>. All Rights Reserved.
3+
~
4+
~ This Source Code Form is subject to the terms of the Mozilla Public
5+
~ License, v. 2.0. If a copy of the MPL was not distributed with this
6+
~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
-->
8+
9+
<Configuration>
10+
<Appenders>
11+
<Lambda name="Lambda" format="${env:AWS_LAMBDA_LOG_FORMAT:-TEXT}">
12+
<LambdaTextFormat>
13+
<PatternLayout>
14+
<pattern>%d{yyyy-MM-dd HH:mm:ss} %X{AWSRequestId} %-5p %c{1} - %m%n</pattern>
15+
</PatternLayout>
16+
</LambdaTextFormat>
17+
<LambdaJSONFormat>
18+
<JsonTemplateLayout eventTemplateUri="classpath:LambdaLayout.json"/>
19+
</LambdaJSONFormat>
20+
</Lambda>
21+
</Appenders>
22+
<Loggers>
23+
<Root level="${env:AWS_LAMBDA_LOG_LEVEL:-INFO}">
24+
<AppenderRef ref="Lambda"/>
25+
</Root>
26+
<Logger name="software.amazon.awssdk" level="WARN"/>
27+
<Logger name="software.amazon.awssdk.request" level="INFO"/>
28+
</Loggers>
29+
</Configuration>

clusterless-substrate-aws-lambda-transform/src/main/resources/log4j2.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

clusterless-substrate-aws-lambda-workload/src/main/resources/log4j2.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)