rcmgr: use default libp2p rcmgr metrics

ipfs · Jun 14, 2023 · 3ba1080 · 3ba1080
1 parent c93e267
commit 3ba1080
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 257 deletions.
diff --git a/core/node/libp2p/rcmgr.go b/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,11 +20,8 @@ import (
 	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
 	rcmgrObs "github.com/libp2p/go-libp2p/p2p/host/resource-manager/obs"
 	"github.com/multiformats/go-multiaddr"
+	"github.com/prometheus/client_golang/prometheus"
 	"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")
@@ -74,8 +75,8 @@ filled in with autocomputed defaults.`)
 			if err != nil {
 				return nil, opts, err
 			}
-
-			ropts := []rcmgr.Option{rcmgr.WithMetrics(createRcmgrMetrics()), rcmgr.WithTraceReporter(str)}
+			rcmgrObs.MustRegisterWith(prometheus.DefaultRegisterer)
+			ropts := []rcmgr.Option{rcmgr.WithTraceReporter(str)}
 
 			if len(cfg.ResourceMgr.Allowlist) > 0 {
 				var mas []multiaddr.Multiaddr

diff --git a/core/node/libp2p/rcmgr_metrics.go b/core/node/libp2p/rcmgr_metrics.go