Bump golang.org/x/crypto from 0.27.0 to 0.31.0

chain/bridge.go

@@ -181,7 +181,6 @@ func (b *Bridge) bridgeStream(ctx context.Context, listenConfig bridge.ListenCon
 					raw = idle.NewIdleConn(raw, idleTimeout)
 				}
 				backoff = time.Second / 10
-				b.logger.Info("Connect", "remote_address", raw.RemoteAddr().String())
 				go b.stepIgnoreErr(ctx, dialer, raw, dials)
 			}
 		}(i, l)
@@ -289,7 +288,6 @@ func (b *Bridge) bridgeProxy(ctx context.Context, listenConfig bridge.ListenConf
 					raw = idle.NewIdleConn(raw, idleTimeout)
 				}
 				backoff = time.Second / 10
-				b.logger.Info("Connect", "remote_address", raw.RemoteAddr().String())
 				go h.ServeConn(raw)
 			}
 		}(i, host)

chain/chain.go

@@ -2,30 +2,36 @@ package chain
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"math/rand"
+	"math"
+	"net"
 	"strings"
+	"sync"
+	"time"
 
 	"github.com/wzshiming/bridge"
 	"github.com/wzshiming/bridge/config"
 	"github.com/wzshiming/bridge/internal/scheme"
-	"github.com/wzshiming/schedialer"
-	"github.com/wzshiming/schedialer/plugins/probe"
-	"github.com/wzshiming/schedialer/plugins/roundrobin"
+	"github.com/wzshiming/bridge/logger"
 )
 
 // BridgeChain is a bridger that supports multiple crossing of bridger.
 type BridgeChain struct {
 	DialerFunc   func(dialer bridge.Dialer) bridge.Dialer
 	proto        map[string]bridge.Bridger
 	defaultProto bridge.Bridger
+
+	backoffCount map[string]uint64
+	mutex        sync.Mutex
 }
 
 // NewBridgeChain create a new BridgeChain.
 func NewBridgeChain() *BridgeChain {
 	return &BridgeChain{
-		proto:      map[string]bridge.Bridger{},
-		DialerFunc: NewEnvDialer,
+		proto:        map[string]bridge.Bridger{},
+		DialerFunc:   NewEnvDialer,
+		backoffCount: map[string]uint64{},
 	}
 }
 
@@ -35,7 +41,7 @@ func (b *BridgeChain) BridgeChain(ctx context.Context, dialer bridge.Dialer, add
 		return dialer, nil
 	}
 	address := addresses[len(addresses)-1]
-	d, err := b.Dial(ctx, dialer, strings.Split(address, "|"), "")
+	d, err := b.multiDial(ctx, dialer, strings.Split(address, "|"))
 	if err != nil {
 		return nil, err
 	}
@@ -65,7 +71,7 @@ func (b *BridgeChain) bridgeChainWithConfig(ctx context.Context, dialer bridge.D
 		return dialer, nil
 	}
 	address := addresses[len(addresses)-1]
-	d, err := b.Dial(ctx, dialer, address.LB, address.Probe)
+	d, err := b.multiDial(ctx, dialer, address.LB)
 	if err != nil {
 		return nil, err
 	}
@@ -76,32 +82,16 @@ func (b *BridgeChain) bridgeChainWithConfig(ctx context.Context, dialer bridge.D
 	return b.bridgeChainWithConfig(ctx, d, addresses...)
 }
 
-func (b *BridgeChain) Dial(ctx context.Context, dialer bridge.Dialer, addresses []string, probeUrl string) (bridge.Dialer, error) {
-	if len(addresses) == 1 {
-		return b.dialOne(ctx, dialer, addresses[0])
-	}
-	plugins := []schedialer.Plugin{
-		roundrobin.NewRoundRobinWithIndex(100, rand.Uint64()%uint64(len(addresses))),
-	}
-	if probeUrl != "" {
-		plugins = append(plugins, probe.NewProbe(100, probeUrl))
-	}
-	plugin := schedialer.NewPlugins(plugins...)
-	for _, address := range addresses {
-		dial, err := b.dialOne(ctx, dialer, address)
-		if err != nil {
-			return nil, err
-		}
-		proxy := schedialer.Proxy{
-			Name:   address,
-			Dialer: dial,
-		}
-		plugin.AddProxy(ctx, &proxy)
+func (b *BridgeChain) multiDial(ctx context.Context, dialer bridge.Dialer, addresses []string) (bridge.Dialer, error) {
+	useCount := &backoffManager{
+		addresses: addresses,
+		dialer:    dialer,
+		bc:        b,
 	}
-	return schedialer.NewSchedialer(plugin), nil
+	return useCount, nil
 }
 
-func (b *BridgeChain) dialOne(ctx context.Context, dialer bridge.Dialer, address string) (bridge.Dialer, error) {
+func (b *BridgeChain) singleDial(ctx context.Context, dialer bridge.Dialer, address string) (bridge.Dialer, error) {
 	sch, _, ok := scheme.SplitSchemeAddr(address)
 	if !ok {
 		return nil, fmt.Errorf("unsupported protocol format %q", address)
@@ -126,3 +116,81 @@ func (b *BridgeChain) Register(name string, bridger bridge.Bridger) error {
 func (b *BridgeChain) RegisterDefault(bridger bridge.Bridger) {
 	b.defaultProto = bridger
 }
+
+type backoffManager struct {
+	addresses []string
+	dialer    bridge.Dialer
+
+	bc *BridgeChain
+}
+
+func (u *backoffManager) useLeastAndCount(addresses []string) string {
+	if len(addresses) == 1 {
+		return addresses[0]
+	}
+	min := uint64(math.MaxUint64)
+
+	u.bc.mutex.Lock()
+	defer u.bc.mutex.Unlock()
+
+	var minAddress string
+	for _, address := range addresses {
+		if u.bc.backoffCount[address] < min {
+			min = u.bc.backoffCount[address]
+			minAddress = address
+		}
+	}
+	u.bc.backoffCount[minAddress]++
+	return minAddress
+}
+
+func (u *backoffManager) backoff(address string, count uint64) {
+	u.bc.mutex.Lock()
+	defer u.bc.mutex.Unlock()
+	u.bc.backoffCount[address] += count
+}
+
+func (u *backoffManager) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	var errs []error
+
+	timeout := time.Second * 10
+	dl, ok := ctx.Deadline()
+	if ok {
+		timeout = time.Until(dl)
+	}
+
+	period := timeout / time.Duration(len(u.addresses))
+	if period < time.Second {
+		period = time.Second
+	} else if period > 5*time.Second {
+		period = 5 * time.Second
+	}
+
+	for i := 0; i < len(u.addresses); i++ {
+		addr := u.useLeastAndCount(u.addresses)
+
+		ctx, cancel := context.WithTimeout(ctx, period)
+
+		dialer, err := u.bc.singleDial(ctx, u.dialer, addr)
+		if err != nil {
+			errs = append(errs, err)
+			logger.Std.Warn("failed dial", "err", err, "previous", addr)
+			cancel()
+			u.backoff(addr, 10)
+			continue
+		}
+		conn, err := dialer.DialContext(ctx, network, address)
+		if err != nil {
+			errs = append(errs, err)
+			logger.Std.Warn("failed dial target", "err", err, "previous", addr, "target", address)
+			cancel()
+			u.backoff(addr, 5)
+			continue
+		}
+
+		logger.Std.Info("success dial target", "previous", addr, "target", address)
+		cancel()
+		return conn, nil
+	}
+	return nil, fmt.Errorf("all addresses are failed: %w", errors.Join(errs...))
+}

cmd/bridge/main.go

@@ -136,7 +136,6 @@ func run(ctx context.Context, log *slog.Logger, tasks []config.Chain) {
 		}
 		go func(task config.Chain) {
 			defer wg.Done()
-			log := log.With("chains", task)
 			log.Info(chain.ShowChainWithConfig(task))
 			b := chain.NewBridge(log, dump)
 			err := b.BridgeWithConfig(ctx, task)

cmd/bridge/main_other.go

@@ -63,7 +63,6 @@ func runWithReload(ctx context.Context, log *slog.Logger, tasks []config.Chain,
 			wg.Add(1)
 			go func(ctx context.Context, task config.Chain) {
 				defer wg.Done()
-				log := log.With("chains", task)
 				log.Info(chain.ShowChainWithConfig(task))
 				for ctx.Err() == nil {
 					b := chain.NewBridge(log, dump)

config/config.go

@@ -100,8 +100,7 @@ func (c Chain) Unique() string {
 }
 
 type Node struct {
-	Probe string   `json:"probe"`
-	LB    []string `json:"lb"`
+	LB []string `json:"lb"`
 }
 
 func (m Node) MarshalJSON() ([]byte, error) {

go.mod

@@ -6,29 +6,28 @@ require (
 	github.com/Microsoft/go-winio v0.6.2
 	github.com/golang/snappy v0.0.4
 	github.com/spf13/pflag v1.0.5
-	github.com/wzshiming/anyproxy v0.7.17
+	github.com/wzshiming/anyproxy v0.7.18
 	github.com/wzshiming/cmux v0.4.2
 	github.com/wzshiming/commandproxy v0.2.0
 	github.com/wzshiming/emux v0.2.1
 	github.com/wzshiming/hostmatcher v0.0.3
 	github.com/wzshiming/httpproxy v0.5.6
 	github.com/wzshiming/notify v0.1.1
 	github.com/wzshiming/permuteproxy v0.0.2
-	github.com/wzshiming/schedialer v0.6.1
 	github.com/wzshiming/shadowsocks v0.4.1
 	github.com/wzshiming/socks4 v0.3.2
 	github.com/wzshiming/socks5 v0.5.1
-	github.com/wzshiming/sshproxy v0.4.4
+	github.com/wzshiming/sshproxy v0.4.5
 )
 
 require (
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/wzshiming/sshd v0.2.3 // indirect
 	github.com/wzshiming/trie v0.3.1 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )

go.sum

@@ -10,8 +10,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaU
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/wzshiming/anyproxy v0.7.17 h1:G0msTAwGvvNy/oJrtvTtlXOfBLtFbTRiaa4Z6dlJAmQ=
-github.com/wzshiming/anyproxy v0.7.17/go.mod h1:WJylkai6NVrasN5+3+IXkJc/AD5dgvJa7HSZIUOO5zE=
+github.com/wzshiming/anyproxy v0.7.18 h1:EIBQ3gzdFQ6AM76NamvnI35swpcF0kgQ1MiwznXuFpw=
+github.com/wzshiming/anyproxy v0.7.18/go.mod h1:bi2C+eiB9XvgOFsM0a/dlPeZoMiMBumuMYmRtBLFNLY=
 github.com/wzshiming/cmux v0.4.2 h1:tI73lL5ztVfiqw7R5m5BkxT1+vQ2PBo/oV6qPbNGPiA=
 github.com/wzshiming/cmux v0.4.2/go.mod h1:JgE61QfZAjEyNMX0iZo9zIKY6pr9bHVY132yYPwHW5U=
 github.com/wzshiming/commandproxy v0.2.0 h1:uPVhgIj2YSncRUo6g9smGR6OMzsIg7lwklcMHPPmEeM=
@@ -26,8 +26,6 @@ github.com/wzshiming/notify v0.1.1 h1:rJXoszrkNglhCVyn/IfW500f5cW03q1q7YzL8hsLch
 github.com/wzshiming/notify v0.1.1/go.mod h1:SFhsQKZJznzsDcj/Qfo9A65k5IRcpUrpgbLRzZEa/DI=
 github.com/wzshiming/permuteproxy v0.0.2 h1:svedMueotlxJk9oJfA0gs8WzRYOdgd0DER9XvKpjwlY=
 github.com/wzshiming/permuteproxy v0.0.2/go.mod h1:Ny08A1JbuljB8FeJAOiB7dfvRGCVD8PB9hwrALIvYI8=
-github.com/wzshiming/schedialer v0.6.1 h1:4VwtIjVF3uMoWqjbyw3oqYi7WGOEYvDu3L9OYT8sbGY=
-github.com/wzshiming/schedialer v0.6.1/go.mod h1:TvVxg4QZIBTJzRfmL/G7g6CzynFQKPmtXtSeJ2c4Lus=
 github.com/wzshiming/shadowsocks v0.4.1 h1:tyLYtLSQs90jpMIkD+T8KuZH5foXwOH0ZjxSOb45orI=
 github.com/wzshiming/shadowsocks v0.4.1/go.mod h1:CfKm/Keclli2sPGfjskGVH+F3gpF0YPVdcf5t4krypY=
 github.com/wzshiming/socks4 v0.3.2 h1:w87nwfgRWteVwIH39nqTur8c+2dcODeLgLrWspcUkSc=
@@ -36,8 +34,8 @@ github.com/wzshiming/socks5 v0.5.1 h1:TRekapqSWrE4QYfGiZ4Ok04wQECuAyQsSUdljvbWO5
 github.com/wzshiming/socks5 v0.5.1/go.mod h1:BvCAqlzocQN5xwLjBZDBbvWlrx8sCYSSbHEOf2wZgT0=
 github.com/wzshiming/sshd v0.2.3 h1:hhMhdysp5/QTRRUti9+0gU0rKFit1kj9Tal2uoPIPG4=
 github.com/wzshiming/sshd v0.2.3/go.mod h1:Qe9S2woomw5ig/jhdiXW5U4FACgDPj4VIq+1jegHtrw=
-github.com/wzshiming/sshproxy v0.4.4 h1:0MhC5QDOO475wGSaHp3oRyQshytY58zXNtt9e1t5ApM=
-github.com/wzshiming/sshproxy v0.4.4/go.mod h1:V3heDEgih0+ggexEwpRihjK16S7i/WIs4eg4JaiaQ5A=
+github.com/wzshiming/sshproxy v0.4.5 h1:99j6ia7NE85e2G7VLHFPkCG2LH0XJajNcGmnJSGiDgM=
+github.com/wzshiming/sshproxy v0.4.5/go.mod h1:V3heDEgih0+ggexEwpRihjK16S7i/WIs4eg4JaiaQ5A=
 github.com/wzshiming/trie v0.3.1 h1:YpuoqmEQFJiW0mns/mM6Qk4kdWrXc8kc28/KR1vn0m8=
 github.com/wzshiming/trie v0.3.1/go.mod h1:c9thxXTh4KcGkejt4sUsO4c5GUmWpxeWzOJ7AZJaI+8=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -46,8 +44,9 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -69,8 +68,9 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -81,8 +81,9 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -91,8 +92,9 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
 golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -101,8 +103,9 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
 golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

logger/logger.go

@@ -1,11 +1,16 @@
 package logger
 
 import (
+	"context"
 	"fmt"
 	"log/slog"
+	"os"
 )
 
-var Std = slog.Default()
+var Std = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
+	Level:     slog.LevelInfo,
+	AddSource: true,
+}))
 
 func Wrap(logger *slog.Logger, name string) *wrap {
 	return &wrap{
@@ -18,5 +23,5 @@ type wrap struct {
 }
 
 func (w wrap) Println(v ...interface{}) {
-	w.Logger.Info(fmt.Sprintln(v...))
+	w.Logger.Log(context.Background(), slog.LevelInfo, fmt.Sprintln(v...))
 }