merge: resolve conflicts with origin/master

kept NAT healing functionality with connection failure tracking
and rediscovery, while adopting structured logging format from master

Author: lidel

.github/workflows/go-check.yml

@@ -3,7 +3,7 @@ name: Go Checks
 on:
   pull_request:
   push:
-    branches: ["master","release-v0[0-9][0-9]"]
+    branches: ["master", "release-v0[0-9][0-9]"]
   workflow_dispatch:
 
 permissions:
@@ -17,6 +17,5 @@ jobs:
   go-check:
     uses: ipdxco/unified-github-workflows/.github/workflows/[email protected]
     with:
-      go-version: "1.24.x"
+      go-version: "1.25.x"
       go-generate-ignore-protoc-version-comments: true
-  

.github/workflows/go-test.yml

@@ -3,7 +3,7 @@ name: Go Test
 on:
   pull_request:
   push:
-    branches: ["master","release-v0[0-9][0-9]"]
+    branches: ["master", "release-v0[0-9][0-9]"]
   workflow_dispatch:
 
 permissions:
@@ -17,6 +17,6 @@ jobs:
   go-test:
     uses: ./.github/workflows/go-test-template.yml
     with:
-      go-versions: '["1.23.x", "1.24.x"]'
+      go-versions: '["1.24.x", "1.25.x"]'
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

README.md

@@ -86,8 +86,41 @@ There's a few things you can do right now to help out:
    instance, you may need to read up on p2p and more complex operations like
    muxing to be able to help technically.
 
+## AI Assistance Notice
 
-## Supported Go Versions
+> [!IMPORTANT]
+>
+> If you are using **any kind of AI assistance** to contribute to libp2p,
+> it must be disclosed in the pull request.
+
+If you are using any kind of AI assistance while contributing to libp2p,
+**this must be disclosed in the pull request**, along with the extent to
+which AI assistance was used (e.g. docs only vs. code generation).
+If PR responses are being generated by an AI, disclose that as well.
+As a small exception, trivial tab-completion doesn't need to be disclosed,
+so long as it is limited to single keywords or short phrases.
+
+An example disclosure:
+
+> This PR was written primarily by Claude Code.
+
+Or a more detailed disclosure:
+
+> I consulted ChatGPT to understand the codebase but the solution
+> was fully authored manually by myself.
+
+Failure to disclose this is first and foremost rude to the human operators
+on the other end of the pull request, but it also makes it difficult to
+determine how much scrutiny to apply to the contribution.
+
+In a perfect world, AI assistance would produce equal or higher quality
+work than any human. That isn't the world we live in today, and in most cases
+it's generating slop. I say this despite being a fan of and using them
+successfully myself (with heavy supervision)!
+
+Please be respectful to maintainers and disclose AI assistance.
+
+# Supported Go Versions
 
 We test against and support the two most recent major releases of Go. This is
 informed by Go's own [security policy](https://go.dev/doc/security/policy).

config/config.go

@@ -23,11 +23,13 @@ import (
 	"github.com/libp2p/go-libp2p/core/sec"
 	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
+	logging "github.com/libp2p/go-libp2p/gologshim"
 	"github.com/libp2p/go-libp2p/p2p/host/autonat"
 	"github.com/libp2p/go-libp2p/p2p/host/autorelay"
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	blankhost "github.com/libp2p/go-libp2p/p2p/host/blank"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"
+	"github.com/libp2p/go-libp2p/p2p/host/observedaddrs"
 	"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
 	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
 	routed "github.com/libp2p/go-libp2p/p2p/host/routed"
@@ -50,6 +52,8 @@ import (
 	"go.uber.org/fx/fxevent"
 )
 
+var log = logging.Logger("p2p-config")
+
 // AddrsFactory is a function that takes a set of multiaddrs we're listening on and
 // returns the set of multiaddrs we should advertise to the network.
 type AddrsFactory = bhost.AddrsFactory
@@ -158,9 +162,7 @@ func (cfg *Config) makeSwarm(eventBus event.Bus, enableMetrics bool) (*swarm.Swa
 
 	// Check this early. Prevents us from even *starting* without verifying this.
 	if pnet.ForcePrivateNetwork && len(cfg.PSK) == 0 {
-		log.Error("tried to create a libp2p node with no Private" +
-			" Network Protector but usage of Private Networks" +
-			" is forced by the environment")
+		log.Error("tried to create a libp2p node with no Private Network Protector but usage of Private Networks is forced by the environment")
 		// Note: This is *also* checked the upgrader itself, so it'll be
 		// enforced even *if* you don't use the libp2p constructor.
 		return nil, pnet.ErrNotInPrivateNetwork
@@ -287,7 +289,11 @@ func (cfg *Config) makeAutoNATV2Host() (host.Host, error) {
 
 func (cfg *Config) addTransports() ([]fx.Option, error) {
 	fxopts := []fx.Option{
-		fx.WithLogger(func() fxevent.Logger { return getFXLogger() }),
+		fx.WithLogger(func() fxevent.Logger {
+			return &fxevent.SlogLogger{
+				Logger: log.With("system", "fx"),
+			}
+		}),
 		fx.Provide(fx.Annotate(tptu.New, fx.ParamTags(`name:"security"`))),
 		fx.Supply(cfg.Muxers),
 		fx.Provide(func() connmgr.ConnectionGater { return cfg.ConnectionGater }),
@@ -434,23 +440,23 @@ func (cfg *Config) addTransports() ([]fx.Option, error) {
 	return fxopts, nil
 }
 
-func (cfg *Config) newBasicHost(swrm *swarm.Swarm, eventBus event.Bus, an *autonatv2.AutoNAT) (*bhost.BasicHost, error) {
+func (cfg *Config) newBasicHost(swrm *swarm.Swarm, eventBus event.Bus, an *autonatv2.AutoNAT, o bhost.ObservedAddrsManager) (*bhost.BasicHost, error) {
 	h, err := bhost.NewHost(swrm, &bhost.HostOpts{
-		EventBus:                        eventBus,
-		ConnManager:                     cfg.ConnManager,
-		AddrsFactory:                    cfg.AddrsFactory,
-		NATManager:                      cfg.NATManager,
-		EnablePing:                      !cfg.DisablePing,
-		UserAgent:                       cfg.UserAgent,
-		ProtocolVersion:                 cfg.ProtocolVersion,
-		EnableHolePunching:              cfg.EnableHolePunching,
-		HolePunchingOptions:             cfg.HolePunchingOptions,
-		EnableRelayService:              cfg.EnableRelayService,
-		RelayServiceOpts:                cfg.RelayServiceOpts,
-		EnableMetrics:                   !cfg.DisableMetrics,
-		PrometheusRegisterer:            cfg.PrometheusRegisterer,
-		DisableIdentifyAddressDiscovery: cfg.DisableIdentifyAddressDiscovery,
-		AutoNATv2:                       an,
+		EventBus:             eventBus,
+		ConnManager:          cfg.ConnManager,
+		AddrsFactory:         cfg.AddrsFactory,
+		NATManager:           cfg.NATManager,
+		EnablePing:           !cfg.DisablePing,
+		UserAgent:            cfg.UserAgent,
+		ProtocolVersion:      cfg.ProtocolVersion,
+		EnableHolePunching:   cfg.EnableHolePunching,
+		HolePunchingOptions:  cfg.HolePunchingOptions,
+		EnableRelayService:   cfg.EnableRelayService,
+		RelayServiceOpts:     cfg.RelayServiceOpts,
+		EnableMetrics:        !cfg.DisableMetrics,
+		PrometheusRegisterer: cfg.PrometheusRegisterer,
+		AutoNATv2:            an,
+		ObservedAddrsManager: o,
 	})
 	if err != nil {
 		return nil, err
@@ -467,7 +473,7 @@ func (cfg *Config) validate() error {
 	if l, ok := cfg.ResourceManager.(connmgr.GetConnLimiter); ok {
 		err := cfg.ConnManager.CheckLimit(l)
 		if err != nil {
-			log.Warn(fmt.Sprintf("rcmgr limit conflicts with connmgr limit: %v", err))
+			log.Warn("rcmgr limit conflicts with connmgr limit", "err", err)
 		}
 	}
 
@@ -529,6 +535,25 @@ func (cfg *Config) NewNode() (host.Host, error) {
 			})
 			return sw, nil
 		}),
+		fx.Provide(func(eventBus event.Bus, s *swarm.Swarm, lifecycle fx.Lifecycle) (bhost.ObservedAddrsManager, error) {
+			if cfg.DisableIdentifyAddressDiscovery {
+				return nil, nil
+			}
+			o, err := observedaddrs.NewManager(eventBus, s)
+			if err != nil {
+				return nil, err
+			}
+			lifecycle.Append(fx.Hook{
+				OnStart: func(context.Context) error {
+					o.Start(s)
+					return nil
+				},
+				OnStop: func(context.Context) error {
+					return o.Close()
+				},
+			})
+			return o, nil
+		}),
 		fx.Provide(func() (*autonatv2.AutoNAT, error) {
 			if !cfg.EnableAutoNATv2 {
 				return nil, nil

config/log.go

@@ -1,25 +1,54 @@
 package canonicallog
 
 import (
-	"fmt"
+	"context"
+	"log/slog"
 	"math/rand"
 	"net"
-	"strings"
+	"os"
+	"runtime"
+	"time"
 
 	"github.com/libp2p/go-libp2p/core/peer"
 
-	logging "github.com/ipfs/go-log/v2"
+	logging "github.com/libp2p/go-libp2p/gologshim"
 	"github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 )
 
-var log = logging.WithSkip(logging.Logger("canonical-log"), 1)
+var log = slog.New(
+	slog.NewTextHandler(
+		os.Stderr,
+		&slog.HandlerOptions{
+			Level:     logging.ConfigFromEnv().LevelForSystem("canonical-log"),
+			AddSource: true}))
+
+// logWithSkip logs at level with AddSource pointing to the caller `skip` frames up
+// from *this* function’s caller (so skip=0 => the immediate caller of logWithSkip).
+func logWithSkip(ctx context.Context, l *slog.Logger, level slog.Level, skip int, msg string, args ...any) {
+	if !l.Enabled(ctx, level) {
+		return
+	}
+
+	var pcs [1]uintptr
+	// +2 to skip runtime.Callers and logWithSkip itself.
+	runtime.Callers(skip+2, pcs[:])
+
+	r := slog.NewRecord(time.Now(), level, msg, pcs[0])
+	r.Add(args...)
+	_ = l.Handler().Handle(ctx, r)
+}
 
 // LogMisbehavingPeer is the canonical way to log a misbehaving peer.
 // Protocols should use this to identify a misbehaving peer to allow the end
 // user to easily identify these nodes across protocols and libp2p.
 func LogMisbehavingPeer(p peer.ID, peerAddr multiaddr.Multiaddr, component string, err error, msg string) {
-	log.Warnf("CANONICAL_MISBEHAVING_PEER: peer=%s addr=%s component=%s err=%q msg=%q", p, peerAddr.String(), component, err, msg)
+	logWithSkip(context.Background(), log, slog.LevelWarn, 1, "CANONICAL_MISBEHAVING_PEER",
+		"peer", p,
+		"addr", peerAddr,
+		"component", component,
+		"err", err,
+		"msg", msg)
 }
 
 // LogMisbehavingPeerNetAddr is the canonical way to log a misbehaving peer.
@@ -28,7 +57,12 @@ func LogMisbehavingPeer(p peer.ID, peerAddr multiaddr.Multiaddr, component strin
 func LogMisbehavingPeerNetAddr(p peer.ID, peerAddr net.Addr, component string, originalErr error, msg string) {
 	ma, err := manet.FromNetAddr(peerAddr)
 	if err != nil {
-		log.Warnf("CANONICAL_MISBEHAVING_PEER: peer=%s net_addr=%s component=%s err=%q msg=%q", p, peerAddr.String(), component, originalErr, msg)
+		logWithSkip(context.Background(), log, slog.LevelWarn, 1, "CANONICAL_MISBEHAVING_PEER",
+			"peer", p,
+			"net_addr", peerAddr.String(),
+			"component", component,
+			"err", originalErr,
+			"msg", msg)
 		return
 	}
 
@@ -44,14 +78,15 @@ func LogMisbehavingPeerNetAddr(p peer.ID, peerAddr net.Addr, component string, o
 // like fail2ban to action on the log.
 func LogPeerStatus(sampleRate int, p peer.ID, peerAddr multiaddr.Multiaddr, keyVals ...string) {
 	if rand.Intn(sampleRate) == 0 {
-		keyValsStr := strings.Builder{}
-		for i, kOrV := range keyVals {
-			if i%2 == 0 {
-				fmt.Fprintf(&keyValsStr, " %v=", kOrV)
-			} else {
-				fmt.Fprintf(&keyValsStr, "%q", kOrV)
-			}
+		args := []any{
+			"peer", p,
+			"addr", peerAddr.String(),
+			"sample_rate", sampleRate,
+		}
+		// Add the additional key-value pairs
+		for _, kv := range keyVals {
+			args = append(args, kv)
 		}
-		log.Infof("CANONICAL_PEER_STATUS: peer=%s addr=%s sample_rate=%v%s", p, peerAddr.String(), sampleRate, keyValsStr.String())
+		logWithSkip(context.Background(), log, slog.LevelInfo, 1, "CANONICAL_PEER_STATUS", args...)
 	}
 }

core/canonicallog/canonicallog.go

@@ -2,20 +2,23 @@ package canonicallog
 
 import (
 	"fmt"
+	"log/slog"
 	"net"
+	"os"
 	"testing"
 
 	"github.com/libp2p/go-libp2p/core/test"
 
-	logging "github.com/ipfs/go-log/v2"
 	"github.com/multiformats/go-multiaddr"
 )
 
 func TestLogs(t *testing.T) {
-	err := logging.SetLogLevel("canonical-log", "info")
-	if err != nil {
-		t.Fatal(err)
-	}
+	originalLogger := log
+	defer func() {
+		log = originalLogger
+	}()
+	// Override to print debug logs
+	log = slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelInfo, AddSource: true}))
 
 	LogMisbehavingPeer(test.RandPeerIDFatal(t), multiaddr.StringCast("/ip4/1.2.3.4"), "somecomponent", fmt.Errorf("something"), "hi")
 

core/canonicallog/canonicallog_test.go

@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/examples
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/caddyserver/certmagic v0.21.6

examples/go.mod

@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/examples/ipfs-camp-2019
 
-go 1.23
+go 1.24
 
 require (
 	github.com/gogo/protobuf v1.3.2

examples/ipfs-camp-2019/go.mod

@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/examples/pubsub/chat
 
-go 1.23
+go 1.24
 
 require (
 	github.com/libp2p/go-libp2p v0.33.0