fix: JVM logging

fixes: #4718
block · Mar 5, 2025 · dcbdbee · dcbdbee
1 parent 707422e
commit dcbdbee
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 2 deletions.
diff --git a/jvm-runtime/ftl-runtime/common/deployment/pom.xml b/jvm-runtime/ftl-runtime/common/deployment/pom.xml
@@ -23,6 +23,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-jackson-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-json-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-deployment</artifactId>

diff --git a/jvm-runtime/ftl-runtime/common/runtime/pom.xml b/jvm-runtime/ftl-runtime/common/runtime/pom.xml
@@ -40,6 +40,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-opentelemetry</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-json</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-jdbc</artifactId>

diff --git a/...tl-runtime/common/runtime/src/main/java/xyz/block/ftl/runtime/config/FTLConfigSource.java b/...tl-runtime/common/runtime/src/main/java/xyz/block/ftl/runtime/config/FTLConfigSource.java
@@ -26,6 +26,7 @@ public class FTLConfigSource implements ConfigSource {
 
     final static String FTL_BIND = "FTL_BIND";
     private static final String OTEL_ENV_VAR = "OTEL_EXPORTER_OTLP_ENDPOINT";
+    public static final String QUARKUS_LOG_LEVEL = "quarkus.log.level";
 
     final FTLController controller;
 
@@ -41,7 +42,7 @@ public class FTLConfigSource implements ConfigSource {
 
     public FTLConfigSource(FTLController controller) {
         this.controller = controller;
-        this.propertyNames = new HashSet<>(List.of(SEPARATE_SERVER, PORT, HOST));
+        this.propertyNames = new HashSet<>(List.of(SEPARATE_SERVER, PORT, HOST, QUARKUS_LOG_LEVEL));
         try (var in = Thread.currentThread().getContextClassLoader().getResourceAsStream(DATASOURCE_NAMES)) {
             String s = new String(in.readAllBytes(), StandardCharsets.UTF_8);
             for (String name : s.split("\n")) {
@@ -71,6 +72,9 @@ public int getOrdinal() {
     @Override
     public String getValue(String s) {
         switch (s) {
+            case QUARKUS_LOG_LEVEL -> {
+                return "DEBUG";
+            }
             case OTEL_METRICS_DISABLED -> {
                 var v = System.getenv(OTEL_ENV_VAR);
                 return Boolean

diff --git a/jvm-runtime/plugin/common/error_detector.go → jvm-runtime/plugin/common/jvm_logging.go b/jvm-runtime/plugin/common/error_detector.go → jvm-runtime/plugin/common/jvm_logging.go
@@ -1,8 +1,10 @@
 package common
 
 import (
+	"encoding/json"
 	"io"
 	"strings"
+	"time"
 
 	"github.com/alecthomas/atomic"
 
@@ -49,6 +51,13 @@ func (o *errorDetector) Write(p []byte) (n int, err error) {
 			o.logger.Tracef("%s", cleanLine)
 		} else if cleanLine, ok := strings.CutPrefix(line, "FINE "); ok {
 			o.logger.Tracef("%s", cleanLine)
+		} else if line[0] == '{' {
+			record := JvmLogRecord{}
+			if err := json.Unmarshal([]byte(line), &record); err == nil {
+				o.logger.Log(record.ToEntry())
+			} else {
+				o.logger.Infof("Log Parse Failure: %s", line)
+			}
 		} else {
 			o.logger.Infof("%s", line)
 		}
@@ -95,3 +104,46 @@ func (o *errorDetector) FinalizeCapture() []builderrors.Error {
 	}
 	return errs
 }
+
+type JvmLogRecord struct {
+	Timestamp       time.Time `json:"timestamp"`
+	Sequence        int       `json:"sequence"`
+	LoggerClassName string    `json:"loggerClassName"`
+	LoggerName      string    `json:"loggerName"`
+	Level           string    `json:"level"`
+	Message         string    `json:"message"`
+	ThreadName      string    `json:"threadName"`
+	ThreadId        int       `json:"threadId"`
+	Mdc             any       `json:"mdc"`
+	Ndc             string    `json:"ndc"`
+	HostName        string    `json:"hostName"`
+	ProcessName     string    `json:"processName"`
+	ProcessId       int       `json:"processId"`
+}
+
+func (r *JvmLogRecord) ToEntry() log.Entry {
+	level := log.Info
+	switch r.Level {
+	case "DEBUG":
+		level = log.Debug
+	case "INFO":
+		level = log.Info
+	case "WARN", "WARNING":
+		level = log.Warn
+	case "ERROR", "SEVERE":
+		level = log.Error
+	case "FINE", "FINER":
+		level = log.Debug
+	case "FINEST", "TRACE":
+		level = log.Trace
+	default:
+		r.Message = r.Level + ": " + r.Message
+	}
+
+	ret := log.Entry{
+		Time:    r.Timestamp,
+		Level:   level,
+		Message: r.Message,
+	}
+	return ret
+}
diff --git a/jvm-runtime/plugin/common/jvmcommon.go b/jvm-runtime/plugin/common/jvmcommon.go
@@ -823,7 +823,7 @@ func (s *Service) ModuleConfigDefaults(ctx context.Context, req *connect.Request
 		defaults.DeployDir = "target"
 	} else if fileExists(buildGradle) || fileExists(buildGradleKts) {
 		defaults.LanguageConfig.Fields["build-tool"] = structpb.NewStringValue(JavaBuildToolGradle)
-		defaults.DevModeBuild = ptr("gradle clean quarkusDev")
+		defaults.DevModeBuild = ptr("gradle clean quarkusDev -Dquarkus.console.enabled=false")
 		defaults.Build = ptr("gradle clean build")
 		defaults.DeployDir = "build"
 	} else {