Pull request 402: AGDNS-2296-dnscrypt-slog-logger

Merge in GO/dnsproxy from AGDNS-2296-dnscrypt-slog-logger to master

Squashed commit of the following:

commit 58a540e454d2f4123d7aa8930f1cdeb27649cc8e
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 6 21:26:18 2025 +0300

    upstream: imp code

commit 816e470b8740c9459ae0841fe70d772c6e151495
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 6 19:40:24 2025 +0300

    proxy: dnscrypt slog logger

commit b2cda7f33932e4932697dc36a5b481f4b8c76eec
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 6 19:10:15 2025 +0300

    all: dnscrypt slog logger

proxy/serverdnscrypt.go

@@ -31,6 +31,7 @@ func (p *Proxy) initDNSCryptListeners(ctx context.Context) (err error) {
 			proxy:   p,
 			reqSema: p.requestsSema,
 		},
+		Logger: p.logger,
 	}
 
 	for _, addr := range p.DNSCryptUDPListenAddr {

proxy/serverdnscrypt_internal_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TODO(d.kolyshev): Remove this after migrating dnscrypt to slog.
+// TODO(d.kolyshev): Remove this after quic-go has migrated to slog.
 func TestMain(m *testing.M) {
 	testutil.DiscardLogOutput(m)
 }

upstream/dnscrypt_internal_test.go

@@ -45,6 +45,7 @@ func startTestDNSCryptServer(
 		ProviderName: rc.ProviderName,
 		ResolverCert: cert,
 		Handler:      h,
+		Logger:       slogutil.NewDiscardLogger(),
 	}
 	testutil.CleanupAndRequireSuccess(t, func() (err error) {
 		ctx, cancel := context.WithTimeout(context.Background(), timeout)

upstream/doh_internal_test.go

@@ -6,6 +6,7 @@ import (
 	"crypto/x509"
 	"encoding/base64"
 	"fmt"
+	"log/slog"
 	"net"
 	"net/http"
 	"net/netip"
@@ -392,6 +393,7 @@ func startDoHServer(
 	server := &http.Server{
 		Handler:     handler,
 		ReadTimeout: time.Second,
+		ErrorLog:    slog.NewLogLogger(slog.DiscardHandler, slog.LevelDebug),
 	}
 
 	// Listen TCP first.

upstream/upstream_internal_test.go

@@ -28,7 +28,7 @@ import (
 
 // TODO(ameshkov): Make tests here not depend on external servers.
 
-// TODO(d.kolyshev): Remove this after migrating dnscrypt to slog.
+// TODO(d.kolyshev): Remove this after quic-go has migrated to slog.
 func TestMain(m *testing.M) {
 	testutil.DiscardLogOutput(m)
 }