all: tslog

internal/dnsproxytest/tslog.go

@@ -0,0 +1,51 @@
+package dnsproxytest
+
+import (
+	"context"
+	"log/slog"
+	"testing"
+)
+
+// TLogHandler is a [slog.Handler] that wraps [testing.TB] logging functions.
+//
+// TODO(a.garipov): Move to golibs.
+type TLogHandler struct {
+	tb testing.TB
+}
+
+// NewTLogHandler creates a [*TLogHandler].
+func NewTLogHandler(tb testing.TB) (h *TLogHandler) {
+	return &TLogHandler{
+		tb: tb,
+	}
+}
+
+// type check
+var _ slog.Handler = (*TLogHandler)(nil)
+
+// Enabled implements the [slog.Handler] interface for *TLogHandler.  It
+// always returns true.
+func (h *TLogHandler) Enabled(_ context.Context, _ slog.Level) (ok bool) { return true }
+
+// Handle implements the [slog.Handler] interface for *TLogHandler.
+func (h *TLogHandler) Handle(_ context.Context, r slog.Record) (err error) {
+	if r.Level >= slog.LevelError {
+		h.tb.Error(r.Message)
+	} else {
+		h.tb.Log(r.Message)
+	}
+
+	return nil
+}
+
+// WithAttrs implements the [slog.Handler] interface for *TLogHandler.  It
+// always returns h.
+func (h *TLogHandler) WithAttrs(_ []slog.Attr) (res slog.Handler) {
+	return h
+}
+
+// WithGroup implements the [slog.Handler] interface for *TLogHandler.  It
+// always returns h.
+func (h *TLogHandler) WithGroup(_ string) (res slog.Handler) {
+	return h
+}

upstream/doq_internal_test.go

@@ -14,6 +14,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/AdguardTeam/dnsproxy/internal/dnsproxytest"
 	"github.com/AdguardTeam/dnsproxy/proxyutil"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
@@ -380,7 +381,6 @@ func (s *testDoQServer) closeConns() (err error) {
 	return errors.Join(errs...)
 }
 
-// startDoQServer starts a test DoQ server.
 // startDoQServer starts a test DoQ server.  Note that it adds its own shutdown
 // to cleanup of t.
 func startDoQServer(t *testing.T, tlsConf *tls.Config, port int) (s *testDoQServer) {
@@ -413,7 +413,7 @@ func startDoQServer(t *testing.T, tlsConf *tls.Config, port int) (s *testDoQServ
 	s = &testDoQServer{
 		addr:     listen.Addr().String(),
 		listener: listen,
-		logger:   slogutil.NewDiscardLogger(),
+		logger:   slog.New(dnsproxytest.NewTLogHandler(t)),
 		conns:    map[quic.EarlyConnection]struct{}{},
 		connsMu:  &sync.Mutex{},
 	}