Add dependency to Flogger
Flogger is an open source project (Apache 2 License) from Google that provides a fluent JAVA API for logging: * https://github.com/google/flogger * https://google.github.io/flogger/ We want to use Flogger instead of slf4j. This idea was discussed at the Gerrit hackathon in Lund [1] and on the mailing list [2]. Benefits: * Better Readability * Better Performance * Will allow us to implement request tracing Flogger API examples: * logger.atSevere() .withCause(err) .log("Error in %s %s", req.getMethod(), uri); * logger.atInfo() .atMostEvery(1, TimeUnit.HOURS) .log(...) * logger.atInfo() .withStackTrace(StackSize.FULL) .log(...) Within Google Flogger is long-established and is used by almost 3/4 of all Google's Java projects, hence this library is very mature. The Flogger API can be used with different logging backends. We are using the log4j backend, as we are currently using log4j as backend with slf4j. This means there are no changes to how logs are configured (existing log4j.properties and log4j.xml files continue to work). It also means that this doesn't effect any integrations that work with log4j (e.g. integration with logstash continues to work). To use the log4j backend for Flogger the system property 'flogger.backend_factory' must be set to 'com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance'. E.g. this system property may be set in gerrit.config: [container] javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance" If this property is not set Gerrit sets it automatically on startup so that we always have a proper logging configuration. We do this in Main.java before loading any class. This is important since Flogger reads this system property only once when the FluentLogger class is loaded and we must be sure that the system property was set before this. Using Flogger and slf4j in parallel is not a problem. Logs from both APIs end up in the same log file(s). This change doesn't migrate any classes to Flogger yet. This will be done by follow-up changes. JGit is still using slf4j and needs an explicit runtime dependency on slf4j. [1] https://docs.google.com/presentation/d/1Kwn77c1PScMLDEWiJDklEm43NsN2-mWm2PqHwYTkJfI/edit?usp=sharing [2] https://groups.google.com/d/msg/repo-discuss/meEWJO7c4pA/fxDx2waRCQAJ Change-Id: Ifc31fb95c10397857e8de5657c729f49c1820ec4 Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
parent
b9999b9a52
commit
2b81d71374
20
WORKSPACE
20
WORKSPACE
@ -171,6 +171,26 @@ maven_jar(
|
|||||||
sha1 = "94ad16d728b374d65bd897625f3fbb3da223a2b6",
|
sha1 = "94ad16d728b374d65bd897625f3fbb3da223a2b6",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
FLOGGER_VERS = "0.2"
|
||||||
|
|
||||||
|
maven_jar(
|
||||||
|
name = "flogger",
|
||||||
|
artifact = "com.google.flogger:flogger:" + FLOGGER_VERS,
|
||||||
|
sha1 = "a22d04ed3b84bae8ecf8aa6d4430ad000bcdf7b4",
|
||||||
|
)
|
||||||
|
|
||||||
|
maven_jar(
|
||||||
|
name = "flogger-log4j-backend",
|
||||||
|
artifact = "com.google.flogger:flogger-log4j-backend:" + FLOGGER_VERS,
|
||||||
|
sha1 = "d5085e3996bddc4b105d53b886190cc9a8811a9e",
|
||||||
|
)
|
||||||
|
|
||||||
|
maven_jar(
|
||||||
|
name = "flogger-system-backend",
|
||||||
|
artifact = "com.google.flogger:flogger-system-backend:" + FLOGGER_VERS,
|
||||||
|
sha1 = "b995c84b8443d6cfbd011a55719b63494b974c3a",
|
||||||
|
)
|
||||||
|
|
||||||
maven_jar(
|
maven_jar(
|
||||||
name = "gwtjsonrpc",
|
name = "gwtjsonrpc",
|
||||||
artifact = "com.google.gerrit:gwtjsonrpc:1.11",
|
artifact = "com.google.gerrit:gwtjsonrpc:1.11",
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
public final class Main {
|
public final class Main {
|
||||||
|
private static final String FLOGGER_BACKEND_PROPERTY = "flogger.backend_factory";
|
||||||
|
|
||||||
// We don't do any real work here because we need to import
|
// We don't do any real work here because we need to import
|
||||||
// the archive lookup code and we cannot import a class in
|
// the archive lookup code and we cannot import a class in
|
||||||
// the default package. So this is just a tiny springboard
|
// the default package. So this is just a tiny springboard
|
||||||
@ -21,6 +23,7 @@ public final class Main {
|
|||||||
|
|
||||||
public static void main(String[] argv) throws Exception {
|
public static void main(String[] argv) throws Exception {
|
||||||
if (onSupportedJavaVersion()) {
|
if (onSupportedJavaVersion()) {
|
||||||
|
configureFloggerBackend();
|
||||||
com.google.gerrit.launcher.GerritLauncher.main(argv);
|
com.google.gerrit.launcher.GerritLauncher.main(argv);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -38,6 +41,18 @@ public final class Main {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void configureFloggerBackend() {
|
||||||
|
if (System.getProperty(FLOGGER_BACKEND_PROPERTY) != null) {
|
||||||
|
// Flogger backend is already configured
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure log4j backend
|
||||||
|
System.setProperty(
|
||||||
|
FLOGGER_BACKEND_PROPERTY,
|
||||||
|
"com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance");
|
||||||
|
}
|
||||||
|
|
||||||
private static double parse(String version) {
|
private static double parse(String version) {
|
||||||
if (version == null || version.length() == 0) {
|
if (version == null || version.length() == 0) {
|
||||||
return 0.0;
|
return 0.0;
|
||||||
|
@ -21,6 +21,7 @@ java_library(
|
|||||||
"//lib:guava",
|
"//lib:guava",
|
||||||
"//lib:gwtorm",
|
"//lib:gwtorm",
|
||||||
"//lib/commons:dbcp",
|
"//lib/commons:dbcp",
|
||||||
|
"//lib/flogger:api",
|
||||||
"//lib/guice",
|
"//lib/guice",
|
||||||
"//lib/jgit/org.eclipse.jgit:jgit",
|
"//lib/jgit/org.eclipse.jgit:jgit",
|
||||||
"//lib/log:api",
|
"//lib/log:api",
|
||||||
|
10
lib/flogger/BUILD
Normal file
10
lib/flogger/BUILD
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
java_library(
|
||||||
|
name = "api",
|
||||||
|
data = ["//lib:LICENSE-Apache2.0"],
|
||||||
|
visibility = ["//visibility:public"],
|
||||||
|
exports = [
|
||||||
|
"@flogger-log4j-backend//jar",
|
||||||
|
"@flogger-system-backend//jar",
|
||||||
|
"@flogger//jar",
|
||||||
|
],
|
||||||
|
)
|
@ -5,7 +5,10 @@ java_library(
|
|||||||
data = ["//lib:LICENSE-jgit"],
|
data = ["//lib:LICENSE-jgit"],
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
exports = [jgit_dep("@jgit_lib//jar")],
|
exports = [jgit_dep("@jgit_lib//jar")],
|
||||||
runtime_deps = [":javaewah"],
|
runtime_deps = [
|
||||||
|
":javaewah",
|
||||||
|
"//lib/log:api",
|
||||||
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
alias(
|
alias(
|
||||||
|
Loading…
Reference in New Issue
Block a user