coder · ammario · Jul 26, 2023 · Jul 26, 2023
diff --git a/agent/agent.go b/agent/agent.go
@@ -755,7 +755,7 @@ func (a *agent) createTailnet(ctx context.Context, agentID uuid.UUID, derpMap *t
 	network, err := tailnet.NewConn(&tailnet.Options{
 		Addresses:      a.wireguardAddresses(agentID),
 		DERPMap:        derpMap,
-		Logger:         a.logger.Named("tailnet"),
+		Logger:         a.logger.Named("net.tailnet"),
 		ListenPort:     a.tailnetListenPort,
 		BlockEndpoints: disableDirectConnections,
 	})

diff --git a/cli/server.go b/cli/server.go
@@ -334,7 +334,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			)
 			if cfg.AccessURL.String() == "" {
 				cliui.Infof(inv.Stderr, "Opening tunnel so workspaces can connect to your deployment. For production scenarios, specify an external access URL")
-				tunnel, err = devtunnel.New(ctx, logger.Named("devtunnel"), cfg.WgtunnelHost.String())
+				tunnel, err = devtunnel.New(ctx, logger.Named("net.devtunnel"), cfg.WgtunnelHost.String())
 				if err != nil {
 					return xerrors.Errorf("create tunnel: %w", err)
 				}
@@ -1751,6 +1751,50 @@ func IsLocalhost(host string) bool {
 	return host == "localhost" || host == "127.0.0.1" || host == "::1"
 }
 
+var _ slog.Sink = &filterSink{}
+
+type filterSink struct {
+	next []slog.Sink
+	re   *regexp.Regexp
+}
+
+func (f *filterSink) compile(res []string) error {
+	if len(res) == 0 {
+		return nil
+	}
+
+	var reb strings.Builder
+	for i, re := range res {
+		_, _ = fmt.Fprintf(&reb, "(%s)", re)
+		if i != len(res)-1 {
+			_, _ = reb.WriteRune('|')
+		}
+	}
+
+	re, err := regexp.Compile(reb.String())
+	if err != nil {
+		return xerrors.Errorf("compile regex: %w", err)
+	}
+	f.re = re
+	return nil
+}
+
+func (f *filterSink) LogEntry(ctx context.Context, ent slog.SinkEntry) {
+	logName := strings.Join(ent.LoggerNames, ".")
+	if f.re != nil && !f.re.MatchString(logName) {
+		return
+	}
+	for _, sink := range f.next {
+		sink.LogEntry(ctx, ent)
+	}
+}
+
+func (f *filterSink) Sync() {
+	for _, sink := range f.next {
+		sink.Sync()
+	}
+}
+
 func BuildLogger(inv *clibase.Invocation, cfg *codersdk.DeploymentValues) (slog.Logger, func(), error) {
 	var (
 		sinks   = []slog.Sink{}
@@ -1795,16 +1839,25 @@ func BuildLogger(inv *clibase.Invocation, cfg *codersdk.DeploymentValues) (slog.
 		sinks = append(sinks, tracing.SlogSink{})
 	}
 
-	level := slog.LevelInfo
-	if cfg.Verbose {
-		level = slog.LevelDebug
-	}
-
+	// User should log to null device if they don't want logs.
 	if len(sinks) == 0 {
 		return slog.Logger{}, nil, xerrors.New("no loggers provided")
 	}
 
-	return slog.Make(sinks...).Leveled(level), func() {
+	filter := &filterSink{next: sinks}
+
+	err = filter.compile(cfg.Logging.Filter.Value())
+	if err != nil {
+		return slog.Logger{}, nil, xerrors.Errorf("compile filters: %w", err)
+	}
+
+	level := slog.LevelInfo
+	// Debug logging is always enabled if a filter is present.
+	if cfg.Verbose || filter.re != nil {
+		level = slog.LevelDebug
+	}
+
+	return slog.Make(filter).Leveled(level), func() {
 		for _, closer := range closers {
 			_ = closer()
 		}

diff --git a/cli/server_test.go b/cli/server_test.go
@@ -1305,7 +1305,7 @@ func TestServer(t *testing.T) {
 
 			root, _ := clitest.New(t,
 				"server",
-				"--verbose",
+				"--log-filter=.*",
 				"--in-memory",
 				"--http-address", ":0",
 				"--access-url", "http://example.com",
@@ -1322,7 +1322,7 @@ func TestServer(t *testing.T) {
 
 			root, _ := clitest.New(t,
 				"server",
-				"--verbose",
+				"--log-filter=.*",
 				"--in-memory",
 				"--http-address", ":0",
 				"--access-url", "http://example.com",
@@ -1339,7 +1339,7 @@ func TestServer(t *testing.T) {
 
 			root, _ := clitest.New(t,
 				"server",
-				"--verbose",
+				"--log-filter=.*",
 				"--in-memory",
 				"--http-address", ":0",
 				"--access-url", "http://example.com",
@@ -1359,7 +1359,7 @@ func TestServer(t *testing.T) {
 
 			inv, _ := clitest.New(t,
 				"server",
-				"--verbose",
+				"--log-filter=.*",
 				"--in-memory",
 				"--http-address", ":0",
 				"--access-url", "http://example.com",
@@ -1393,7 +1393,7 @@ func TestServer(t *testing.T) {
 			// HTTP.
 			inv, _ := clitest.New(t,
 				"server",
-				"--verbose",
+				"--log-filter=.*",
 				"--in-memory",
 				"--http-address", ":0",
 				"--access-url", "http://example.com",

diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -83,12 +83,13 @@ Use a YAML configuration file when your server launch become unwieldy.
       --log-json string, $CODER_LOGGING_JSON
           Output JSON logs to a given file.
 
+  -l, --log-filter string-array, $CODER_LOG_FILTER
+          Filter debug logs by matching against a given regex. Use .* to match
+          all debug logs.
+
       --log-stackdriver string, $CODER_LOGGING_STACKDRIVER
           Output Stackdriver compatible logs to a given file.
 
-  -v, --verbose bool, $CODER_VERBOSE
-          Output debug-level logs.
-
 [1mIntrospection / Prometheus Options[0m 
       --prometheus-address host:port, $CODER_PROMETHEUS_ADDRESS (default: 127.0.0.1:2112)
           The bind address to serve prometheus metrics.
@@ -106,8 +107,7 @@ Use a YAML configuration file when your server launch become unwieldy.
       --trace-logs bool, $CODER_TRACE_LOGS
           Enables capturing of logs as events in traces. This is useful for
           debugging, but may result in a very large amount of events being sent
-          to the tracing backend which may incur significant costs. If the
-          verbose flag was supplied, debug-level logs will be included.
+          to the tracing backend which may incur significant costs.
 
       --trace bool, $CODER_TRACE_ENABLE
           Whether application tracing data is collected. It exports to a backend

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -183,14 +183,17 @@ introspection:
     enable: false
     # Enables capturing of logs as events in traces. This is useful for debugging, but
     # may result in a very large amount of events being sent to the tracing backend
-    # which may incur significant costs. If the verbose flag was supplied, debug-level
-    # logs will be included.
+    # which may incur significant costs.
     # (default: <unset>, type: bool)
     captureLogs: false
   logging:
     # Output debug-level logs.
     # (default: <unset>, type: bool)
     verbose: false
+    # Filter debug logs by matching against a given regex. Use .* to match all debug
+    # logs.
+    # (default: <unset>, type: string-array)
+    filter: []
     # Output human-readable logs to a given file.
     # (default: /dev/stderr, type: string)
     humanPath: /dev/stderr

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -691,7 +691,7 @@ func (api *API) _dialWorkspaceAgentTailnet(agentID uuid.UUID) (*codersdk.Workspa
 	conn, err := tailnet.NewConn(&tailnet.Options{
 		Addresses:      []netip.Prefix{netip.PrefixFrom(tailnet.IP(), 128)},
 		DERPMap:        api.DERPMap(),
-		Logger:         api.Logger.Named("tailnet"),
+		Logger:         api.Logger.Named("net.tailnet"),
 		BlockEndpoints: api.DeploymentValues.DERP.Config.BlockDirect.Value(),
 	})
 	if err != nil {

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -340,9 +340,10 @@ type SwaggerConfig struct {
 }
 
 type LoggingConfig struct {
-	Human       clibase.String `json:"human" typescript:",notnull"`
-	JSON        clibase.String `json:"json" typescript:",notnull"`
-	Stackdriver clibase.String `json:"stackdriver" typescript:",notnull"`
+	Filter      clibase.StringArray `json:"log_filter" typescript:",notnull"`
+	Human       clibase.String      `json:"human" typescript:",notnull"`
+	JSON        clibase.String      `json:"json" typescript:",notnull"`
+	Stackdriver clibase.String      `json:"stackdriver" typescript:",notnull"`
 }
 
 type DangerousConfig struct {
@@ -533,6 +534,16 @@ when required by your organization's security policy.`,
 		Group:       &deploymentGroupNetworking,
 		YAML:        "redirectToAccessURL",
 	}
+	logFilter := clibase.Option{
+		Name:          "Log Filter",
+		Description:   "Filter debug logs by matching against a given regex. Use .* to match all debug logs.",
+		Flag:          "log-filter",
+		FlagShorthand: "l",
+		Env:           "CODER_LOG_FILTER",
+		Value:         &c.Logging.Filter,
+		Group:         &deploymentGroupIntrospectionLogging,
+		YAML:          "filter",
+	}
 	opts := clibase.OptionSet{
 		{
 			Name:        "Access URL",
@@ -1159,7 +1170,7 @@ when required by your organization's security policy.`,
 		},
 		{
 			Name:        "Capture Logs in Traces",
-			Description: "Enables capturing of logs as events in traces. This is useful for debugging, but may result in a very large amount of events being sent to the tracing backend which may incur significant costs. If the verbose flag was supplied, debug-level logs will be included.",
+			Description: "Enables capturing of logs as events in traces. This is useful for debugging, but may result in a very large amount of events being sent to the tracing backend which may incur significant costs.",
 			Flag:        "trace-logs",
 			Env:         "CODER_TRACE_LOGS",
 			Value:       &c.Trace.CaptureLogs,
@@ -1249,12 +1260,14 @@ when required by your organization's security policy.`,
 			Flag:          "verbose",
 			Env:           "CODER_VERBOSE",
 			FlagShorthand: "v",
-
-			Value:       &c.Verbose,
-			Group:       &deploymentGroupIntrospectionLogging,
-			YAML:        "verbose",
-			Annotations: clibase.Annotations{}.Mark(annotationExternalProxies, "true"),
+			Hidden:        true,
+			UseInstead:    []clibase.Option{logFilter},
+			Value:         &c.Verbose,
+			Group:         &deploymentGroupIntrospectionLogging,
+			YAML:          "verbose",
+			Annotations:   clibase.Annotations{}.Mark(annotationExternalProxies, "true"),
 		},
+		logFilter,
 		{
 			Name:        "Human Log Location",
 			Description: "Output human-readable logs to a given file.",

diff --git a/docs/api/general.md b/docs/api/general.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/docs/cli/server.md b/docs/cli/server.md