Skip to content

KNET-18079: Upgrade log4j1 to log4j2 #561

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 5 commits into from
Apr 4, 2025
Merged

KNET-18079: Upgrade log4j1 to log4j2 #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ed8031
Upgrade log4j1 to log4j2
shubh-ranade Apr 1, 2025
cb4afee
Migrate log4j1 configuration files
shubh-ranade Apr 2, 2025
abb70d1
Update license
shubh-ranade Apr 2, 2025
d3eb498
Use yaml configs instead of xml
shubh-ranade Apr 2, 2025
16b7d3b
Dependency for log4j yaml config
shubh-ranade Apr 3, 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
9 changes: 7 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
Expand Down Expand Up @@ -226,8 +231,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this already declared in top level pom of this project?

Copy link
Member Author

@shubh-ranade shubh-ranade Apr 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is declared in top level pom. Should I add it there? Maybe all modules don't need this which could be why it wasn't declared in top level pom.

<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
19 changes: 13 additions & 6 deletions core/src/test/resources/log4j.properties → core/src/test/resources/log4j2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##

log4j.rootLogger=INFO, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n
Configuration:
name: "Log4j2"
Appenders:
Console:
name: "STDOUT"
target: "SYSTEM_OUT"
PatternLayout:
pattern: "[%d] %v1Level %m (%c:%L)%n"
Loggers:
Root:
level: "INFO"
AppenderRef:
ref: "STDOUT"
9 changes: 7 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
Expand Down
12 changes: 0 additions & 12 deletions examples/src/main/resources/log4j.properties
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions examples/src/main/resources/log4j2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Configuration:
name: "Log4j2"
Appenders:
Console:
name: "STDOUT"
target: "SYSTEM_OUT"
PatternLayout:
pattern: "[%d] %v1Level %m (%c:%L)%n"
Loggers:
Root:
level: "INFO"
AppenderRef:
ref: "STDOUT"
Logger:
- name: "org.apache.kafka"
level: "ERROR"
AppenderRef:
ref: "STDOUT"
- name: "org.I0Itec.zkclient"
level: "ERROR"
AppenderRef:
ref: "STDOUT"
- name: "io.confluent.rest-utils.requests"
level: "INFO"
AppenderRef:
ref: "STDOUT"
- name: "kafka"
level: "OFF"
AppenderRef:
ref: "STDOUT"
9 changes: 7 additions & 2 deletions fips-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@
<version>${io.confluent.rest-utils.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
19 changes: 13 additions & 6 deletions ...tests/src/test/resources/log4j.properties → fips-tests/src/test/resources/log4j2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##

log4j.rootLogger=INFO, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n
Configuration:
name: "Log4j2"
Appenders:
Console:
name: "STDOUT"
target: "SYSTEM_OUT"
PatternLayout:
pattern: "[%d] %v1Level %m (%c:%L)%n"
Loggers:
Root:
level: "INFO"
AppenderRef:
ref: "STDOUT"
6 changes: 6 additions & 0 deletions licenses/NOTICE.confluent-common.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ The following libraries are included in packaged versions of this project:
* LICENSE: licenses/LICENSE.mit.txt
* HOMEPAGE: http://www.slf4j.org/

* Apache Log4j
* COPYRIGHT: Copyright 1999-2024 Apache Software Foundation
* LICENSE: licenses/LICENSE.apache2.txt
* NOTICE: licenses/NOTICE.log4j2.txt
* HOMEPAGE: https://logging.apache.org/log4j/2.x/

* ZkClient
* LICENSE: licenses/LICENSE.apache2.txt
* HOMEPAGE: https://github.com/sgroschupf/zkclient
20 changes: 20 additions & 0 deletions licenses/NOTICE.log4j2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Apache Log4j
Copyright 1999-2024 Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

ResolverUtil.java
Copyright 2005-2006 Tim Fennell

Dumbster SMTP test server
Copyright 2004 Jason Paul Kitchen

TypeUtil.java
Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams

picocli (http://picocli.info)
Copyright 2017 Remko Popma

TimeoutBlockingWaitStrategy.java and parts of Util.java
Copyright 2011 LMAX Ltd.