Skip to content

Commit fa1fe87

Browse files
authored
test(gazelle): Use json instead of color logs
Rely on json formatted logs to avoid postprecessing and unstable color format.
1 parent 8ff3022 commit fa1fe87

File tree

66 files changed

+57
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+57
-83
lines changed

java/gazelle/lang.go

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,23 @@ type javaLang struct {
4040
func NewLanguage() language.Language {
4141
goLevel, javaLevel := logconfig.LogLevel()
4242

43-
logger := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).
44-
With().
45-
Timestamp().
46-
Caller().
47-
Logger().
48-
Level(goLevel)
43+
var logger zerolog.Logger
44+
if os.Getenv("GAZELLE_JAVA_LOG_FORMAT") == "json" {
45+
logger = zerolog.New(os.Stderr)
46+
} else {
47+
logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr})
48+
}
49+
50+
if os.Getenv("GAZELLE_JAVA_LOG_TIMESTAMP") != "false" {
51+
logger = logger.With().Timestamp().Logger()
52+
}
53+
54+
if os.Getenv("GAZELLE_JAVA_LOG_CALLER") != "false" {
55+
logger = logger.With().Caller().Logger()
56+
}
57+
58+
logger = logger.Level(goLevel)
59+
4960
logger.Debug().Msg("creating java language")
5061

5162
l := javaLang{

java/gazelle/private/testutil/reset_zerolog_timestamps/BUILD.bazel

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

java/gazelle/private/testutil/reset_zerolog_timestamps/constant_logger.go

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

java/gazelle/private/testutil/reset_zerolog_timestamps/noop_language.go

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

java/gazelle/testdata/BUILD.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle_binary", "gazelle_generation_test")
88
gazelle_binary(
99
name = "gazelle",
1010
languages = [
11-
# Register a fake language which makes timestamps consistent via static initializers.
12-
# Otherwise we end up with stderr diffs every time we run the tests beacuse of timestamps.
13-
# (Yes, this is a horrible hack).
14-
"//java/gazelle/private/testutil/reset_zerolog_timestamps",
1511
"@bazel_gazelle//language/proto:go_default_library",
1612
"//java/gazelle",
1713
],
@@ -32,6 +28,11 @@ gazelle_binary(
3228
[
3329
gazelle_generation_test(
3430
name = file[0:-len("/WORKSPACE")],
31+
env = {
32+
"GAZELLE_JAVA_LOG_CALLER": "false",
33+
"GAZELLE_JAVA_LOG_FORMAT": "json",
34+
"GAZELLE_JAVA_LOG_TIMESTAMP": "false",
35+
},
3536
gazelle_binary = ":gazelle",
3637
gazelle_timeout_seconds = 30,
3738
test_data = glob(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12:00AM WRN java/gazelle/private/maven/resolver.go:XXX > not loading maven dependencies error="open %WORKSPACEPATH%/maven_install.json: no such file or directory" _c=maven-resolver
1+
{"level":"warn","_c":"maven-resolver","error":"open %WORKSPACEPATH%/maven_install.json: no such file or directory","message":"not loading maven dependencies"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12:00AM WRN java/gazelle/private/maven/resolver.go:XXX > not loading maven dependencies error="open %WORKSPACEPATH%/maven_install.json: no such file or directory" _c=maven-resolver
1+
{"level":"warn","_c":"maven-resolver","error":"open %WORKSPACEPATH%/maven_install.json: no such file or directory","message":"not loading maven dependencies"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12:00AM WRN java/gazelle/private/maven/resolver.go:XXX > not loading maven dependencies error="open %WORKSPACEPATH%/maven_install.json: no such file or directory" _c=maven-resolver
1+
{"level":"warn","_c":"maven-resolver","error":"open %WORKSPACEPATH%/maven_install.json: no such file or directory","message":"not loading maven dependencies"}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
12:00AM WRN java/gazelle/private/maven/resolver.go:XXX > not loading maven dependencies error="open %WORKSPACEPATH%/maven_install.json: no such file or directory" _c=maven-resolver
2-
12:00AM WRN java/gazelle/resolve.go:XXX > Unable to find package for import in any dependency from rule=//src/test/com/example/child/grandchild package=org.junit
3-
12:00AM WRN java/gazelle/resolve.go:XXX > Unable to find package for import in any dependency from rule=//src/test/com/example/child package=org.junit
4-
12:00AM WRN java/gazelle/resolve.go:XXX > Unable to find package for import in any dependency from rule=//src/test/com/example package=org.junit
1+
{"level":"warn","_c":"maven-resolver","error":"open %WORKSPACEPATH%/maven_install.json: no such file or directory","message":"not loading maven dependencies"}
2+
{"level":"warn","package":"org.junit","from rule":"//src/test/com/example/child/grandchild","message":"Unable to find package for import in any dependency"}
3+
{"level":"warn","package":"org.junit","from rule":"//src/test/com/example/child","message":"Unable to find package for import in any dependency"}
4+
{"level":"warn","package":"org.junit","from rule":"//src/test/com/example","message":"Unable to find package for import in any dependency"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12:00AM WRN java/gazelle/private/maven/resolver.go:XXX > not loading maven dependencies error="open %WORKSPACEPATH%/maven_install.json: no such file or directory" _c=maven-resolver
1+
{"level":"warn","_c":"maven-resolver","error":"open %WORKSPACEPATH%/maven_install.json: no such file or directory","message":"not loading maven dependencies"}

0 commit comments

Comments
 (0)