refactor(rcmgr): use default libp2p rcmgr metrics (#9947)

Co-authored-by: Marcin Rataj <[email protected]>

core/node/libp2p/rcmgr.go

@@ -7,6 +7,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/ipfs/kubo/config"
+	"github.com/ipfs/kubo/core/node/helpers"
+	"github.com/ipfs/kubo/repo"
+
 	"github.com/benbjohnson/clock"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p"
@@ -16,10 +20,6 @@ import (
 	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
 	"github.com/multiformats/go-multiaddr"
 	"go.uber.org/fx"
-
-	"github.com/ipfs/kubo/config"
-	"github.com/ipfs/kubo/core/node/helpers"
-	"github.com/ipfs/kubo/repo"
 )
 
 var rcmgrLogger = logging.Logger("rcmgr")
@@ -70,7 +70,6 @@ filled in with autocomputed defaults.`)
 			}
 
 			ropts := []rcmgr.Option{
-				rcmgr.WithMetrics(createRcmgrMetrics()),
 				rcmgr.WithTraceReporter(str),
 				rcmgr.WithLimitPerSubnet(
 					nil,

docs/changelogs/v0.33.md

@@ -18,6 +18,12 @@
 
 This release includes some refactorings and improvements affecting Bitswap which should improve reliability. One of the changes affects blocks providing. Previously, the bitswap layer took care itself of announcing new blocks -added or received- with the configured provider (i.e. DHT). This bypassed the "Reprovider", that is, the system that manages precisely "providing" the blocks stored by Kubo. The Reprovider knows how to take advantage of the [AcceleratedDHTClient](https://github.com/ipfs/kubo/blob/master/docs/config.md#routingaccelerateddhtclient), is able to handle priorities, logs statistics and is able to resume on daemon reboot where it left off. From now on, Bitswap will not be doing any providing on-the-side and all announcements are managed by the reprovider. In some cases, when the reproviding queue is full with other elements, this may cause additional delays, but more likely this will result in improved block-providing behaviour overall.
 
+#### Using default `libp2p_rcmgr`  metrics
+
+Bespoke rcmgr metrics [were removed](https://github.com/ipfs/kubo/pull/9947), Kubo now exposes only the default `libp2p_rcmgr` metrics from go-libp2p.
+This makes it easier to compare Kubo with custom implementations based on go-libp2p.
+If you depended on removed ones, please fill an issue to add them to the upstream [go-libp2p](https://github.com/libp2p/go-libp2p).
+
 #### 📦️ Dependency updates
 
 - update `boxo` to [v0.24.TODO](https://github.com/ipfs/boxo/releases/tag/v0.24.TODO)

test/sharness/t0119-prometheus-data/prometheus_metrics_added_by_enabling_rcmgr

@@ -1,4 +0,0 @@
-libp2p_rcmgr_memory_allocations_allowed_total
-libp2p_rcmgr_memory_allocations_blocked_total
-libp2p_rcmgr_peer_blocked_total
-libp2p_rcmgr_peers_allowed_total