Merge pull request moby#4044 from chagui/master

Author: jedevc

cmd/buildctl/main.go

@@ -19,6 +19,7 @@ import (
 	_ "github.com/moby/buildkit/util/tracing/detect/jaeger"
 	_ "github.com/moby/buildkit/util/tracing/env"
 	"github.com/moby/buildkit/version"
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"go.opentelemetry.io/otel"
@@ -57,6 +58,12 @@ func main() {
 			Usage: "buildkitd address",
 			Value: defaultAddress,
 		},
+		// Add format flag to control log formatter
+		cli.StringFlag{
+			Name:  "log-format",
+			Usage: "log formatter: json or text",
+			Value: "text",
+		},
 		cli.StringFlag{
 			Name:  "tlsservername",
 			Usage: "buildkitd server name for certificate validation",
@@ -106,8 +113,16 @@ func main() {
 
 	app.Before = func(context *cli.Context) error {
 		debugEnabled = context.GlobalBool("debug")
-
-		logrus.SetFormatter(&logrus.TextFormatter{FullTimestamp: true})
+		// Use Format flag to control log formatter
+		logFormat := context.GlobalString("log-format")
+		switch logFormat {
+		case "json":
+			logrus.SetFormatter(&logrus.JSONFormatter{})
+		case "text", "":
+			logrus.SetFormatter(&logrus.TextFormatter{FullTimestamp: true})
+		default:
+			return errors.Errorf("unsupported log type %q", logFormat)
+		}
 		if debugEnabled {
 			logrus.SetLevel(logrus.DebugLevel)
 		}

cmd/buildkitd/config/config.go

@@ -14,6 +14,10 @@ type Config struct {
 
 	// Entitlements e.g. security.insecure, network.host
 	Entitlements []string `toml:"insecure-entitlements"`
+
+	// LogFormat is the format of the logs. It can be "json" or "text".
+	Log LogConfig `toml:"log"`
+
 	// GRPC configuration settings
 	GRPC GRPCConfig `toml:"grpc"`
 
@@ -31,6 +35,10 @@ type Config struct {
 	History *HistoryConfig `toml:"history"`
 }
 
+type LogConfig struct {
+	Format string `toml:"format"`
+}
+
 type GRPCConfig struct {
 	Address      []string `toml:"address"`
 	DebugAddress string   `toml:"debugAddress"`

cmd/buildkitd/main.go

@@ -171,6 +171,12 @@ func main() {
 			Usage: "listening address (socket or tcp)",
 			Value: &cli.StringSlice{defaultConf.GRPC.Address[0]},
 		},
+		// Add format flag to control log formatter
+		cli.StringFlag{
+			Name:  "log-format",
+			Usage: "log formatter: json or text",
+			Value: "text",
+		},
 		cli.StringFlag{
 			Name:  "group",
 			Usage: "group (name or gid) which will own all Unix socket listening addresses",
@@ -227,7 +233,16 @@ func main() {
 			return err
 		}
 
-		logrus.SetFormatter(&logrus.TextFormatter{FullTimestamp: true})
+		logFormat := cfg.Log.Format
+		switch logFormat {
+		case "json":
+			logrus.SetFormatter(&logrus.JSONFormatter{})
+		case "text", "":
+			logrus.SetFormatter(&logrus.TextFormatter{FullTimestamp: true})
+		default:
+			return errors.Errorf("unsupported log type %q", logFormat)
+		}
+
 		if cfg.Debug {
 			logrus.SetLevel(logrus.DebugLevel)
 		}
@@ -478,7 +493,9 @@ func applyMainFlags(c *cli.Context, cfg *config.Config) error {
 	if c.IsSet("root") {
 		cfg.Root = c.String("root")
 	}
-
+	if c.IsSet("log-format") {
+		cfg.Log.Format = c.String("log-format")
+	}
 	if c.IsSet("addr") || len(cfg.GRPC.Address) == 0 {
 		cfg.GRPC.Address = c.StringSlice("addr")
 	}

docs/buildkitd.toml.md

@@ -18,6 +18,10 @@ root = "/var/lib/buildkit"
 # insecure-entitlements allows insecure entitlements, disabled by default.
 insecure-entitlements = [ "network.host", "security.insecure" ]
 
+[log]
+  # log formatter: json or text
+  format = "text"
+
 [grpc]
   address = [ "tcp://0.0.0.0:1234" ]
   # debugAddress is address for attaching go profiles and debuggers.

docs/reference/buildctl.md

@@ -24,6 +24,7 @@ COMMANDS:
 GLOBAL OPTIONS:
    --debug                enable debug output in logs
    --addr value           buildkitd address (default: "unix:///run/buildkit/buildkitd.sock")
+   --log-format value     log formatter: json or text (default: "text")
    --tlsservername value  buildkitd server name for certificate validation
    --tlscacert value      CA certificate for validation
    --tlscert value        client certificate