Upgrade to log/slog.

boot/crawl/crawl_test.go

@@ -156,7 +156,7 @@ func TestCrawler_request_noadvert(t *testing.T) {
 
 	sock := socket.New(conn)
 	c := crawl.New(h, sock, rangeUDP(),
-		/*socket.WithLogger(logger)*/)
+	/*socket.WithLogger(logger)*/)
 	assert.NoError(t, c.Close(), "should close gracefully")
 }
 
@@ -225,7 +225,7 @@ func TestCrawler_advertise(t *testing.T) {
 
 	sock := socket.New(conn)
 	c := crawl.New(h, sock, rangeUDP(),
-		/*socket.WithLogger(logger)*/)
+	/*socket.WithLogger(logger)*/)
 	defer c.Close()
 
 	ttl, err := c.Advertise(ctx, "casm")
@@ -266,8 +266,8 @@ func TestCrawler_FindPeers_strategy_error(t *testing.T) {
 		return nil, errFail
 	}
 
-sock := socket.New(conn)
-	c := crawl.New(h, sock, fail, /*socket.WithLogger(logger)*/)
+	sock := socket.New(conn)
+	c := crawl.New(h, sock, fail /*socket.WithLogger(logger)*/)
 	defer func() {
 		assert.NoError(t, c.Close(), "should close gracefully")
 	}()
@@ -318,7 +318,7 @@ func TestCrawler_FindPeers_wait(t *testing.T) {
 			Times(1)
 
 		sock := socket.New(conn)
-		c := crawl.New(h, sock, rangeUDP(&net.UDPAddr{}), /*socket.WithLogger(logger)*/)
+		c := crawl.New(h, sock, rangeUDP(&net.UDPAddr{}) /*socket.WithLogger(logger)*/)
 		defer c.Close()
 
 		ch, err := c.FindPeers(context.TODO(), "test")
@@ -379,7 +379,7 @@ func TestCrawler_FindPeers_wait(t *testing.T) {
 			Times(1)
 
 		sock := socket.New(conn)
-		c := crawl.New(h, sock, rangeUDP(&net.UDPAddr{}), /*socket.WithLogger(logger)*/)
+		c := crawl.New(h, sock, rangeUDP(&net.UDPAddr{}) /*socket.WithLogger(logger)*/)
 		defer c.Close()
 
 		ch, err := c.FindPeers(context.TODO(), "test")
@@ -460,7 +460,7 @@ func TestCrawler_find_peers(t *testing.T) {
 
 	sock := socket.New(conn)
 	c := crawl.New(h, sock, rangeUDP(addr),
-		/*socket.WithLogger(logger)*/)
+	/*socket.WithLogger(logger)*/)
 	defer c.Close()
 
 	ctx, cancel := context.WithCancel(context.Background())

boot/socket/option.go

@@ -1,11 +1,10 @@
 package socket
 
 import (
+	"log/slog"
 	"net"
 
 	"github.com/wetware/pkg/util/log"
-
-	"golang.org/x/exp/slog"
 )
 
 type Option func(*Socket)

cap/csp/proc/proc.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"net"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 
 	"capnproto.org/go/capnp/v3"
 	"capnproto.org/go/capnp/v3/exp/bufferpool"

cap/csp/server/executor.go

@@ -9,14 +9,15 @@ import (
 	"os"
 	"time"
 
+	"log/slog"
+
 	"capnproto.org/go/capnp/v3"
 	"capnproto.org/go/capnp/v3/rpc"
 	"github.com/ipfs/go-cid"
 	"github.com/stealthrocket/wazergo"
 	"github.com/tetratelabs/wazero"
 	wasm "github.com/tetratelabs/wazero/api"
 	"github.com/tetratelabs/wazero/experimental/sock"
-	"golang.org/x/exp/slog"
 
 	api "github.com/wetware/pkg/api/process"
 	"github.com/wetware/pkg/cap/csp"

cap/pubsub/refcount_test.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"log/slog"
+
 	capnp "capnproto.org/go/capnp/v3"
 	"github.com/golang/mock/gomock"
 	"github.com/libp2p/go-libp2p"
@@ -14,7 +16,6 @@ import (
 	"github.com/stretchr/testify/require"
 	api "github.com/wetware/pkg/api/pubsub"
 	test_log "github.com/wetware/pkg/util/log/test"
-	"golang.org/x/exp/slog"
 )
 
 func TestTopicManager(t *testing.T) {

cap/pubsub/router.go

@@ -3,11 +3,12 @@ package pubsub
 import (
 	"context"
 
+	"log/slog"
+
 	capnp "capnproto.org/go/capnp/v3"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	api "github.com/wetware/pkg/api/pubsub"
 	"github.com/wetware/pkg/util/log"
-	"golang.org/x/exp/slog"
 )
 
 // Router is a client capability that confers the right to join pubsub

client/dialer.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"strings"
 
 	"capnproto.org/go/capnp/v3/rpc"
@@ -13,8 +14,6 @@ import (
 	"github.com/wetware/pkg/system"
 	"github.com/wetware/pkg/util/log"
 	"github.com/wetware/pkg/util/proto"
-
-	"golang.org/x/exp/slog"
 )
 
 var ErrNoPeers = errors.New("no peers")

cluster/cluster.go

@@ -11,10 +11,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"log/slog"
+
 	"capnproto.org/go/capnp/v3"
 	"github.com/jpillora/backoff"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
-	"golang.org/x/exp/slog"
 
 	"github.com/lthibault/jitterbug/v2"
 

cluster/cluster_test.go

@@ -6,11 +6,12 @@ import (
 	"testing"
 	"time"
 
+	"log/slog"
+
 	"github.com/golang/mock/gomock"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/wetware/pkg/cluster"
 	test_cluster "github.com/wetware/pkg/cluster/test"
-	"golang.org/x/exp/slog"
 
 	"github.com/stretchr/testify/assert"
 )

cmd/ww/cluster/cluster.go

@@ -1,6 +1,7 @@
 package cluster
 
 import (
+	"log/slog"
 	"path"
 	"runtime"
 	"time"
@@ -10,7 +11,6 @@ import (
 	quic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/exp/slog"
 
 	"github.com/wetware/pkg/cap/host"
 	"github.com/wetware/pkg/client"

cmd/ww/ls/ls.go

@@ -3,8 +3,9 @@ package ls
 import (
 	"fmt"
 
+	"log/slog"
+
 	"github.com/urfave/cli/v2"
-	"golang.org/x/exp/slog"
 
 	"github.com/wetware/pkg/cap/host"
 	"github.com/wetware/pkg/cap/view"

cmd/ww/main.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	_ "embed"
 	"fmt"
+	"log/slog"
 	"os"
 	"os/signal"
 	"path"
@@ -17,7 +18,6 @@ import (
 
 	"github.com/tetratelabs/wazero/sys"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/exp/slog"
 
 	ww "github.com/wetware/pkg"
 	"github.com/wetware/pkg/cmd/ww/cluster"

cmd/ww/run/run.go

@@ -2,6 +2,7 @@ package run
 
 import (
 	"errors"
+	"log/slog"
 	"os"
 
 	"capnproto.org/go/capnp/v3"
@@ -12,7 +13,6 @@ import (
 	"github.com/wetware/pkg/client"
 	"github.com/wetware/pkg/rom"
 	"github.com/wetware/pkg/system"
-	"golang.org/x/exp/slog"
 )
 
 var flags = []cli.Flag{

cmd/ww/start/start.go

@@ -3,14 +3,14 @@ package start
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"strings"
 
 	"github.com/libp2p/go-libp2p"
 	quic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	tcp "github.com/libp2p/go-libp2p/p2p/transport/tcp"
 	"github.com/urfave/cli/v2"
 	"github.com/wetware/pkg/server"
-	"golang.org/x/exp/slog"
 )
 
 var meta map[string]string

go.mod

@@ -43,7 +43,6 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/tetratelabs/wazero v1.3.1
 	go.uber.org/multierr v1.11.0
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
 	golang.org/x/sync v0.3.0
 	golang.org/x/time v0.3.0
 	lukechampine.com/blake3 v1.2.1
@@ -136,6 +135,7 @@ require (
 	go.opentelemetry.io/otel/metric v1.16.0 // indirect
 	go.opentelemetry.io/otel/trace v1.16.0 // indirect
 	go.uber.org/dig v1.17.0 // indirect
+	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
 	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect

guest/system/logging.go

@@ -1,9 +1,8 @@
 package system
 
 import (
+	"log/slog"
 	"os"
-
-	"golang.org/x/exp/slog"
 )
 
 func init() {

guest/system/system.go

@@ -3,14 +3,14 @@ package system
 import (
 	"context"
 	"io"
+	"log/slog"
 	"net"
 	"os"
 	"runtime"
 	"syscall"
 
 	"capnproto.org/go/capnp/v3/rpc"
 	"github.com/wetware/pkg/system"
-	"golang.org/x/exp/slog"
 )
 
 const (

server/server.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"strings"
 
 	"github.com/libp2p/go-libp2p"
@@ -25,7 +26,6 @@ import (
 	"github.com/wetware/pkg/system"
 	"github.com/wetware/pkg/util/log"
 	"github.com/wetware/pkg/util/proto"
-	"golang.org/x/exp/slog"
 )
 
 type ClientProvider interface {

system/logging.go

@@ -3,10 +3,10 @@ package system
 import (
 	"context"
 	"errors"
+	"log/slog"
 
 	"capnproto.org/go/capnp/v3/exc"
 	"github.com/wetware/pkg/util/log"
-	"golang.org/x/exp/slog"
 )
 
 // ErrorReporter handles Cap'n Proto RPC errors.

system/system.go

@@ -3,6 +3,7 @@ package system
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"net"
 	"time"
 
@@ -15,7 +16,6 @@ import (
 	"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
 	"github.com/wetware/pkg/util/log"
 	"go.uber.org/multierr"
-	"golang.org/x/exp/slog"
 )
 
 type Closer struct {

ww.go

@@ -9,13 +9,14 @@ import (
 	"net"
 	"runtime"
 
+	"log/slog"
+
 	"capnproto.org/go/capnp/v3"
 	"github.com/tetratelabs/wazero"
 	"github.com/tetratelabs/wazero/api"
 	"github.com/tetratelabs/wazero/experimental/sock"
 	"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
 	"github.com/tetratelabs/wazero/sys"
-	"golang.org/x/exp/slog"
 
 	csp_server "github.com/wetware/pkg/cap/csp/server"
 	"github.com/wetware/pkg/rom"