Add --level to 'encore run', tweak log levels

Author: eandre

cli/cmd/encore/run.go

@@ -32,6 +32,14 @@ var (
 	}
 	watch    bool
 	listen   string
+	logLevel = cmdutil.Oneof{
+		Value:     "",
+		Allowed:   []string{"trace", "debug", "info", "warn", "error"},
+		Flag:      "level",
+		FlagShort: "l",
+		Desc:      "Minimum log level to display",
+		TypeDesc:  "string",
+	}
 	port     uint
 	jsonLogs bool
 	browser  = cmdutil.Oneof{
@@ -46,7 +54,7 @@ var (
 
 func init() {
 	runCmd := &cobra.Command{
-		Use:   "run [--debug] [--watch=true] [--port=4000] [--listen=<listen-addr>]",
+		Use:   "run [--debug] [--watch=true] [--level=TRACE] [--port=4000] [--listen=<listen-addr>]",
 		Short: "Runs your application",
 		Args:  cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
@@ -71,6 +79,7 @@ func init() {
 	runCmd.Flags().BoolVar(&color, "color", isTerm, "Whether to display colorized output")
 	runCmd.Flags().BoolVar(&noColor, "no-color", false, "Equivalent to --color=false")
 	runCmd.Flags().MarkHidden("no-color")
+	logLevel.AddFlag(runCmd)
 	debug.AddFlag(runCmd)
 	browser.AddFlag(runCmd)
 }
@@ -124,6 +133,7 @@ func runApp(appRoot, wd string) {
 		TraceFile:  root.TraceFile,
 		Namespace:  nonZeroPtr(nsName),
 		Browser:    browserMode,
+		LogLevel:   nonZeroPtr(logLevel.Value),
 	})
 	if err != nil {
 		fatal(err)

cli/daemon/run.go

@@ -17,6 +17,7 @@ import (
 	"encr.dev/internal/userconfig"
 	"encr.dev/internal/version"
 	"encr.dev/pkg/fns"
+	"encr.dev/pkg/option"
 	daemonpb "encr.dev/proto/encore/daemon"
 )
 
@@ -147,6 +148,7 @@ func (s *Server) Run(req *daemonpb.RunRequest, stream daemonpb.Daemon_RunServer)
 		OpsTracker: ops,
 		Browser:    browser,
 		Debug:      run.DebugModeFromProto(req.DebugMode),
+		LogLevel:   option.FromPointer(req.LogLevel),
 	})
 	if err != nil {
 		s.mu.Unlock()

cli/daemon/run/run.go

@@ -101,6 +101,9 @@ type StartParams struct {
 
 	// Debug specifies to compile the application for debugging.
 	Debug builder.DebugMode
+
+	// LogLevel overrides the default log level for the run.
+	LogLevel option.Option[string]
 }
 
 // BrowserMode specifies how to open the browser when starting 'encore run'.
@@ -582,6 +585,7 @@ func (r *Run) StartProcGroup(params *StartProcGroupParams) (p *ProcGroup, err er
 			IncludeMeta:       r.Builder.NeedsMeta(),
 			MetaPath:          metaPath,
 			RuntimeConfigPath: runtimeConfigPath,
+			LogLevel:          r.Params.LogLevel,
 		},
 		Experiments: params.Experiments,
 		Meta:        params.Meta,

cli/daemon/run/runtime_config2.go

@@ -87,6 +87,9 @@ type RuntimeConfigGenerator struct {
 	// instead of including it as an environment variable.
 	RuntimeConfigPath option.Option[string]
 
+	// Minimum log level, if any.
+	LogLevel option.Option[string]
+
 	// The values of defined secrets.
 	DefinedSecrets map[string]string
 	// The configs, per service.
@@ -153,10 +156,16 @@ func (g *RuntimeConfigGenerator) initialize() error {
 		if err != nil {
 			return errors.Wrap(err, "failed to get app's build settings")
 		}
+
+		logLevel := appFile.LogLevel
+		if level, ok := g.LogLevel.Get(); ok {
+			logLevel = level
+		}
+
 		for _, svc := range g.md.Svcs {
 			cfg := &runtimev1.HostedService{
 				Name:      svc.Name,
-				LogConfig: ptrOrNil(appFile.LogLevel),
+				LogConfig: ptrOrNil(logLevel),
 			}
 
 			if appFile.Build.WorkerPooling {

docs/go/how-to/debug.md

@@ -78,7 +78,7 @@ $ encore run --debug
 API Base URL:      http://localhost:4000
 Dev Dashboard URL: http://localhost:9400/hello-world-cgu2
 Process ID:        51894
-1:48PM INF registered endpoint path=/hello/:name service=hello endpoint=Hello
+1:48PM TRC registered endpoint path=/hello/:name service=hello endpoint=Hello
 ```
 
 (Your process id will differ).
@@ -115,4 +115,3 @@ it has completed, click `Run | Attach to Process` again. In the dialog that appe
 process ID from above.
 
 That's it. You should be able to set breakpoints and have the Encore application pause when they’re hit like you would expect.
-

docs/go/quick-start.mdx

@@ -191,8 +191,8 @@ The output where you're running your app will look something like this:
 ```output
 Changes detected, recompiling...
 Reloaded successfully.
-INF registered endpoint endpoint=World path=/hello/:name service=hello
-INF listening for incoming HTTP requests
+TRC registered endpoint endpoint=World path=/hello/:name service=hello
+TRC listening for incoming HTTP requests
 ```
 
 🥐 Test your change by calling your API again.

docs/go/tutorials/rest-api.mdx

@@ -85,7 +85,7 @@ You should see this:
 ```output
 Your API is running at:     http://localhost:4000
 Development Dashboard URL:  http://localhost:9400
-4:19PM INF registered endpoint path=/url service=url endpoint=Shorten
+4:19PM TRC registered endpoint path=/url service=url endpoint=Shorten
 ```
 
 🥐 Next, call your endpoint from the Local Development Dashboard at [http://localhost:9400](http://localhost:9400) and view a trace of the response.

docs/ts/quick-start.mdx

@@ -191,8 +191,8 @@ The output where you're running your app will look something like this:
 ```output
 Changes detected, recompiling...
 Reloaded successfully.
-INF registered endpoint endpoint=World path=/hello/:name service=hello
-INF listening for incoming HTTP requests
+TRC registered endpoint endpoint=World path=/hello/:name service=hello
+TRC listening for incoming HTTP requests
 ```
 
 🥐 Test your change by calling your API again.

e2e-tests/app_test.go

@@ -88,6 +88,7 @@ func RunApp(c testing.TB, appRoot string, logger RunLogger, env []string) *RunAp
 		ResourceManager: rm,
 		Mgr:             mgr,
 		Builder:         bld,
+		Params:          &StartParams{},
 	}
 
 	parse, build, configs := testBuild(c, appRoot, env)

e2e-tests/echo_app_test.go

@@ -591,6 +591,7 @@ func TestProcClosedOnCtxCancel(t *testing.T) {
 		ListenAddr:      "127.0.0.1:34212",
 		SvcProxy:        svcProxy,
 		Builder:         v2builder.New(),
+		Params:          &StartParams{},
 	}
 
 	parse, build, _ := testBuild(c, appRoot, append(os.Environ(), "ENCORE_EXPERIMENT=v2"))