chore: update go-libp2p v0.22.0

This remove the github.com/libp2p/go-libp2p-loggables because AFAIT this is not usefull anymore (we use tracing now).

If people care about uuids in logs, we should log sessions in go-log instead.

.github/workflows/go-check.yml

@@ -16,7 +16,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.18.x"
+          go-version: "1.19.x"
       - name: Run repo-specific setup
         uses: ./.github/actions/go-check-setup
         if: hashFiles('./.github/actions/go-check-setup') != ''
@@ -27,7 +27,7 @@ jobs:
             echo "RUNGOGENERATE=true" >> $GITHUB_ENV
           fi
       - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@d7e217c1ff411395475b2971c0824e1e7cc1af98 # 2022.1 (v0.3.0)
+        run: go install honnef.co/go/tools/cmd/staticcheck@v0.3.3 # 2022.1.3 (v0.3.3)
       - name: Check that go.mod is tidy
         uses: protocol/[email protected]
         with:

.github/workflows/go-test.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu", "windows", "macos" ]
-        go: [ "1.17.x", "1.18.x" ]
+        go: [ "1.18.x", "1.19.x" ]
     env:
       COVERAGES: ""
     runs-on: ${{ format('{0}-latest', matrix.os) }}

benchmarks_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"math"
 	"math/rand"
 	"os"
@@ -15,7 +14,7 @@ import (
 
 	"github.com/ipfs/go-bitswap/internal/testutil"
 	blocks "github.com/ipfs/go-block-format"
-	protocol "github.com/libp2p/go-libp2p-core/protocol"
+	protocol "github.com/libp2p/go-libp2p/core/protocol"
 
 	"github.com/ipfs/go-bitswap"
 	bsnet "github.com/ipfs/go-bitswap/network"
@@ -115,7 +114,7 @@ func BenchmarkFixedDelay(b *testing.B) {
 	}
 
 	out, _ := json.MarshalIndent(benchmarkLog, "", "  ")
-	_ = ioutil.WriteFile("tmp/benchmark.json", out, 0666)
+	_ = os.WriteFile("tmp/benchmark.json", out, 0666)
 	printResults(benchmarkLog)
 }
 
@@ -183,7 +182,7 @@ func BenchmarkFetchFromOldBitswap(b *testing.B) {
 	}
 
 	out, _ := json.MarshalIndent(benchmarkLog, "", "  ")
-	_ = ioutil.WriteFile("tmp/benchmark.json", out, 0666)
+	_ = os.WriteFile("tmp/benchmark.json", out, 0666)
 	printResults(benchmarkLog)
 }
 
@@ -241,7 +240,7 @@ func BenchmarkRealWorld(b *testing.B) {
 		subtestDistributeAndFetchRateLimited(b, 300, 200, slowNetworkDelay, slowBandwidthGenerator, stdBlockSize, bstoreLatency, allToAll, batchFetchAll)
 	})
 	out, _ := json.MarshalIndent(benchmarkLog, "", "  ")
-	_ = ioutil.WriteFile("tmp/rw-benchmark.json", out, 0666)
+	_ = os.WriteFile("tmp/rw-benchmark.json", out, 0666)
 	printResults(benchmarkLog)
 }
 
@@ -264,7 +263,7 @@ func BenchmarkDatacenter(b *testing.B) {
 		subtestDistributeAndFetchRateLimited(b, 3, 100, datacenterNetworkDelay, datacenterBandwidthGenerator, largeBlockSize, bstoreLatency, allToAll, unixfsFileFetch)
 	})
 	out, _ := json.MarshalIndent(benchmarkLog, "", "  ")
-	_ = ioutil.WriteFile("tmp/rb-benchmark.json", out, 0666)
+	_ = os.WriteFile("tmp/rb-benchmark.json", out, 0666)
 	printResults(benchmarkLog)
 }
 
@@ -305,7 +304,7 @@ func BenchmarkDatacenterMultiLeechMultiSeed(b *testing.B) {
 	})
 
 	out, _ := json.MarshalIndent(benchmarkLog, "", "  ")
-	_ = ioutil.WriteFile("tmp/rb-benchmark.json", out, 0666)
+	_ = os.WriteFile("tmp/rb-benchmark.json", out, 0666)
 	printResults(benchmarkLog)
 }
 

bitswap.go

@@ -17,7 +17,7 @@ import (
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	exchange "github.com/ipfs/go-ipfs-exchange-interface"
 	logging "github.com/ipfs/go-log"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 
 	"go.uber.org/multierr"
 )

bitswap_test.go

@@ -21,9 +21,9 @@ import (
 	delay "github.com/ipfs/go-ipfs-delay"
 	mockrouting "github.com/ipfs/go-ipfs-routing/mock"
 	ipld "github.com/ipfs/go-ipld-format"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	p2ptestutil "github.com/libp2p/go-libp2p-netutil"
 	tu "github.com/libp2p/go-libp2p-testing/etc"
+	p2ptestutil "github.com/libp2p/go-libp2p-testing/netutil"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 func isCI() bool {

client/client.go

@@ -37,7 +37,7 @@ import (
 	"github.com/ipfs/go-metrics-interface"
 	process "github.com/jbenet/goprocess"
 	procctx "github.com/jbenet/goprocess/context"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 var log = logging.Logger("bitswap-client")

client/internal/blockpresencemanager/blockpresencemanager.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 // BlockPresenceManager keeps track of which peers have indicated that they

client/internal/blockpresencemanager/blockpresencemanager_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-bitswap/internal/testutil"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 
 	cid "github.com/ipfs/go-cid"
 )

client/internal/messagequeue/messagequeue.go

@@ -13,7 +13,7 @@ import (
 	bsnet "github.com/ipfs/go-bitswap/network"
 	cid "github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"
 	"go.uber.org/zap"
 )

client/internal/messagequeue/messagequeue_test.go

@@ -16,7 +16,7 @@ import (
 
 	bsmsg "github.com/ipfs/go-bitswap/message"
 	bsnet "github.com/ipfs/go-bitswap/network"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"
 )
 

client/internal/peermanager/peermanager.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ipfs/go-metrics-interface"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 var log = logging.Logger("bs:peermgr")

client/internal/peermanager/peermanager_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ipfs/go-bitswap/internal/testutil"
 	cid "github.com/ipfs/go-cid"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 type msg struct {

client/internal/peermanager/peerwantmanager.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 // Gauge can be used to keep track of a metric that increases and decreases

client/internal/peermanager/peerwantmanager_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/go-bitswap/internal/testutil"
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 type gauge struct {

client/internal/providerquerymanager/providerquerymanager.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 var log = logging.Logger("bitswap")

client/internal/providerquerymanager/providerquerymanager_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/ipfs/go-bitswap/internal/testutil"
 
 	cid "github.com/ipfs/go-cid"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 type fakeProviderNetwork struct {

client/internal/session/peerresponsetracker.go

@@ -3,7 +3,7 @@ package session
 import (
 	"math/rand"
 
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 // peerResponseTracker keeps track of how many times each peer was the first

client/internal/session/peerresponsetracker_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-bitswap/internal/testutil"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 func TestPeerResponseTrackerInit(t *testing.T) {

client/internal/session/sentwantblockstracker.go

@@ -2,7 +2,7 @@ package session
 
 import (
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 // sentWantBlocksTracker keeps track of which peers we've sent a want-block to

client/internal/session/session.go

@@ -14,8 +14,7 @@ import (
 	cid "github.com/ipfs/go-cid"
 	delay "github.com/ipfs/go-ipfs-delay"
 	logging "github.com/ipfs/go-log"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	loggables "github.com/libp2p/go-libp2p-loggables"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 	"go.uber.org/zap"
 )
 
@@ -128,7 +127,6 @@ type Session struct {
 	periodicSearchDelay delay.D
 	// identifiers
 	notif notifications.PubSub
-	uuid  logging.Loggable
 	id    uint64
 
 	self peer.ID
@@ -164,7 +162,6 @@ func New(
 		incoming:            make(chan op, 128),
 		latencyTrkr:         latencyTracker{},
 		notif:               notif,
-		uuid:                loggables.Uuid("GetBlockRequest"),
 		baseTickDelay:       time.Millisecond * 500,
 		id:                  id,
 		initialSearchDelay:  initialSearchDelay,
@@ -242,8 +239,6 @@ func (s *Session) GetBlocks(ctx context.Context, keys []cid.Cid) (<-chan blocks.
 	ctx, span := internal.StartSpan(ctx, "Session.GetBlocks")
 	defer span.End()
 
-	ctx = logging.ContextWithLoggable(ctx, s.uuid)
-
 	return bsgetter.AsyncGetBlocks(ctx, s.ctx, keys, s.notif,
 		func(ctx context.Context, keys []cid.Cid) {
 			select {

client/internal/session/session_test.go

@@ -15,7 +15,7 @@ import (
 	cid "github.com/ipfs/go-cid"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
 	delay "github.com/ipfs/go-ipfs-delay"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 type mockSessionMgr struct {

client/internal/session/sessionwantsender.go

@@ -6,7 +6,7 @@ import (
 	bsbpm "github.com/ipfs/go-bitswap/client/internal/blockpresencemanager"
 
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 const (

client/internal/session/sessionwantsender_test.go

@@ -11,7 +11,7 @@ import (
 	bsspm "github.com/ipfs/go-bitswap/client/internal/sessionpeermanager"
 	"github.com/ipfs/go-bitswap/internal/testutil"
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 type sentWants struct {

client/internal/sessionmanager/sessionmanager.go

@@ -17,7 +17,7 @@ import (
 	bssession "github.com/ipfs/go-bitswap/client/internal/session"
 	bssim "github.com/ipfs/go-bitswap/client/internal/sessioninterestmanager"
 	exchange "github.com/ipfs/go-ipfs-exchange-interface"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 // Session is a session that is managed by the session manager

client/internal/sessionmanager/sessionmanager_test.go

@@ -18,7 +18,7 @@ import (
 
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 type fakeSession struct {

client/internal/sessionpeermanager/sessionpeermanager.go

@@ -6,7 +6,7 @@ import (
 
 	logging "github.com/ipfs/go-log"
 
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 var log = logging.Logger("bs:sprmgr")

client/internal/sessionpeermanager/sessionpeermanager_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-bitswap/internal/testutil"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 type fakePeerTagger struct {