Skip to content

Commit d98b7ec

Browse files
authored
fix: Test flake for DataDog agent logs (#1026)
Sometimes the DataDog agent would fail to connect and angrily log using the standard lib logger. This would fail tests. See: https://github.com/coder/coder/runs/6038192436?check_suite_focus=true
1 parent 1df750b commit d98b7ec

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

cli/start.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ func start() *cobra.Command {
6464
root := &cobra.Command{
6565
Use: "start",
6666
RunE: func(cmd *cobra.Command, args []string) error {
67+
logger := slog.Make(sloghuman.Sink(os.Stderr))
6768
if traceDatadog {
68-
tracer.Start()
69+
tracer.Start(tracer.WithLogStartup(false), tracer.WithLogger(&datadogLogger{
70+
logger: logger.Named("datadog"),
71+
}))
6972
defer tracer.Stop()
7073
}
7174

@@ -153,7 +156,6 @@ func start() *cobra.Command {
153156
return xerrors.Errorf("parse ssh keygen algorithm %s: %w", sshKeygenAlgorithmRaw, err)
154157
}
155158

156-
logger := slog.Make(sloghuman.Sink(os.Stderr))
157159
options := &coderd.Options{
158160
AccessURL: accessURLParsed,
159161
Logger: logger.Named("coderd"),
@@ -534,3 +536,11 @@ func configureTLS(listener net.Listener, tlsMinVersion, tlsClientAuth, tlsCertFi
534536

535537
return tls.NewListener(listener, tlsConfig), nil
536538
}
539+
540+
type datadogLogger struct {
541+
logger slog.Logger
542+
}
543+
544+
func (d *datadogLogger) Log(msg string) {
545+
d.logger.Debug(context.Background(), msg)
546+
}

0 commit comments

Comments
 (0)