Issue #4572 - Replace Jetty Logging with slf4j #4611

joakime · 2020-02-26T22:53:32Z

This is the large draft PR that @gregw asked to see.

The changes from PR #4601 have been merged into here, along with all of the other changes.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

+ JPMS module-info.java + StacklessLogging supports java.lang.Package arrays now + Removing OSGi Require-Capability against serviceloader Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Preparing for refactoring to cleanup usage of old school Jetty logging to slf4j. Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…4572-replace-jetty-logging Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…4572-replace-jetty-logging Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-util/src/main/java/org/eclipse/jetty/util/log/JavaUtilLog.java # jetty-util/src/main/java/org/eclipse/jetty/util/log/JettyLogHandler.java # jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java # jetty-util/src/main/java/org/eclipse/jetty/util/log/Logger.java # jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java # jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…d containerClasspath Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…4572-replace-jetty-logging

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…mpls do" This reverts commit 1339bd1 Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…0.x-4572-replace-jetty-logging Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-slf4j-impl/pom.xml # jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLogger.java # jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerConfiguration.java # jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java # jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggingServiceProvider.java # jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StacklessLogging.java # jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StdErrAppender.java # jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/JettyLoggerConfigurationTest.java # jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/JettyLoggerTest.java # jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/StdErrAppenderTest.java

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…4572-replace-jetty-logging Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime · 2020-02-27T18:59:43Z

jetty-maven-plugin/src/it/javax-annotation-api/pom.xml

@@ -45,7 +45,12 @@
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-slf4j12</artifactId>
+      <artifactId>slf4j-log4j12</artifactId>


The prior entry log4j-slf4j12 doesn't exist. (it was a mistake of mine in a prior commit on this branch)

joakime · 2020-02-27T19:00:56Z

jetty-maven-plugin/src/it/javax-annotation-api/pom.xml

+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>


This entry fixes a bad version mismatch for jul-to-slf4j that is brought in transitively by a different dependency

joakime · 2020-02-27T19:01:15Z

jetty-maven-plugin/src/it/javax-annotation-api/src/main/resources/log4j.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">


And this log4j.xml just makes the output appear on the console (something that the it tests expect)

joakime · 2020-03-09T13:47:25Z

Closing this as it's not meant to be reviewed. Branch will be deleted in the near future.

joakime added 30 commits February 18, 2020 10:40

Issue #4572 - Initial implementation of jetty-slf4j-impl

0a13d72

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Updates to jetty-slf4j-impl

b86f353

+ JPMS module-info.java + StacklessLogging supports java.lang.Package arrays now + Removing OSGi Require-Capability against serviceloader Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Stripping org.eclipse.jetty.util.log

0bc6c83

Preparing for refactoring to cleanup usage of old school Jetty logging to slf4j. Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - First pass at updating for slf4j-api usage

e4a08ec

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Adding missing bridge API for Log to slf4j

9ccad14

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Second pass at updating for slf4j-api usage

1bdb0b7

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Updating tests that are failing

aecbab4

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Updating to slf4j 2.0.0-alpha1

12706fd

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…

c4e1015

…4572-replace-jetty-logging Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Build and checkstyle fixes (post-merge)

e26e4d0

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Fixing javadoc

ded899f

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Migrating jetty-home logging modules

e49e5ab

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Downgrading to slf4j 1.8 (as 2.0 isn't ready yet)

08e2bb6

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Better jetty-start default provider handling

61bf517

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Setting a rewrite module default (rewrite needs a cleanup)

4f6ae4c

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Restoring default jetty module provides logic

0ed7a3b

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Making sure jetty-home works with new logging modules

4c8f2d6

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Fixing osgi testing and org.slf4j

8c06600

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Fixing non-IT jetty-maven-plugin test error

ab178f3

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - no longer excluding slf4j from jetty-maven-plugin forke…

9034014

…d containerClasspath Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…

2ca5d73

…4572-replace-jetty-logging

Issue #4572 - Introduce jetty-slf4j-impl

324b1ce

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Removed commented plugin (not used)

c972e60

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Removing JettyLoggingEvent to address PR concerns

3a05df4

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Making Appender final in JettyLogger per PR review

66627df

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Level name formatting per PR review

e754c69

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Formatting of Timestamp is cached now

4dc2bff

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Removing lax formatting and only using slf4j formatting

5edd02d

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Removing JettyLoggerFactory singleton instance behaviors

8a85bfb

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime added 6 commits February 26, 2020 12:53

Issue #4572 - Making fields in JettyLoggerFactory final

7202854

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Adding synchronized to getLogger() like other impls do

1339bd1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Revert "Issue #4572 - Adding synchronized to getLogger() like other i…

0fd661c

…mpls do" This reverts commit 1339bd1 Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Changes from PR Review

74bf554

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Bumping slf4j version back to 2.0.0-alpha1

4744a16

joakime added Do Not Merge WIP / Draft labels Feb 26, 2020

joakime self-assigned this Feb 26, 2020

joakime linked an issue Feb 26, 2020 that may be closed by this pull request

Replace Jetty Logging #4572

Closed

joakime added 7 commits February 26, 2020 17:31

Issue #4572 - Some post-merge fixes

3cc4d82

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Removing use of org.eclipse.jetty.util.log.class property

5bcf71c

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Adding missing test dep on jetty-slf4j-impl

473f179

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…

db4e867

…4572-replace-jetty-logging Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java

Issue #4572 - Allowing tests to access StdErrAppender stream

8f03c3d

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Bumping up slf4j to 2.0.0-alpha1

bad7c2a

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #4572 - Fixing it/javax-annotation-api

c98c5d3

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime commented Feb 27, 2020

View reviewed changes

joakime requested a review from gregw February 28, 2020 18:16

gregw mentioned this pull request Mar 9, 2020

Issue #4572 - Replace Jetty Logging with slf4j logging (part 2 of 3) #4643

Merged

joakime closed this Mar 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue #4572 - Replace Jetty Logging with slf4j #4611

Issue #4572 - Replace Jetty Logging with slf4j #4611

joakime commented Feb 26, 2020

joakime Feb 27, 2020

joakime Feb 27, 2020

joakime Feb 27, 2020

joakime commented Mar 9, 2020

		@@ -0,0 +1,15 @@
		<?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">

Issue #4572 - Replace Jetty Logging with slf4j #4611

Issue #4572 - Replace Jetty Logging with slf4j #4611

Conversation

joakime commented Feb 26, 2020

joakime Feb 27, 2020

Choose a reason for hiding this comment

joakime Feb 27, 2020

Choose a reason for hiding this comment

joakime Feb 27, 2020

Choose a reason for hiding this comment

joakime commented Mar 9, 2020