Revert "Unshared blockstore (#150)"

This reverts commit edb5cd4.

go.mod

@@ -30,6 +30,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.14.0
 	go.opentelemetry.io/otel/trace v1.14.0
 	go.uber.org/atomic v1.10.0
+	go.uber.org/multierr v1.9.0
 	go.uber.org/zap v1.24.0
 )
 
@@ -166,7 +167,6 @@ require (
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	go.uber.org/dig v1.15.0 // indirect
 	go.uber.org/fx v1.18.2 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
 	golang.org/x/mod v0.7.0 // indirect

handlers.go

@@ -149,16 +149,14 @@ func makeGatewayHandler(bs bstore.Blockstore, kuboRPC []string, port int, blockC
 
 	gwHandler := gateway.NewHandler(gwConf, gwAPI)
 	ipfsHandler := withHTTPMetrics(gwHandler, "ipfs")
-	//ipnsHandler := withHTTPMetrics(gwHandler, "ipns")
-	ipnsHandler := gwHandler
+	ipnsHandler := withHTTPMetrics(gwHandler, "ipns")
 
 	mux := http.NewServeMux()
 	mux.Handle("/ipfs/", ipfsHandler)
 	mux.Handle("/ipns/", ipnsHandler)
 	// TODO: below is legacy which we want to remove, measuring this separately
 	// allows us to decide when is the time to do it.
-	//legacyKuboRpcHandler := withHTTPMetrics(newKuboRPCHandler(kuboRPC), "legacyKuboRpc")
-	legacyKuboRpcHandler := newKuboRPCHandler(kuboRPC)
+	legacyKuboRpcHandler := withHTTPMetrics(newKuboRPCHandler(kuboRPC), "legacyKuboRpc")
 	mux.Handle("/api/v0/", legacyKuboRpcHandler)
 
 	// Construct the HTTP handler for the gateway.

lib/blockstore_cache.go

@@ -21,31 +21,36 @@ const DefaultCacheBlockStoreSize = 1024
 
 var cacheLog = golog.Logger("cache/block")
 
-var cacheHitsMetric = prometheus.NewCounter(prometheus.CounterOpts{
-	Namespace: "ipfs",
-	Subsystem: "http",
-	Name:      "blockstore_cache_hit",
-	Help:      "The number of global block cache hits.",
-})
-
-var cacheRequestsMetric = prometheus.NewCounter(prometheus.CounterOpts{
-	Namespace: "ipfs",
-	Subsystem: "http",
-	Name:      "blockstore_cache_requests",
-	Help:      "The number of global block cache requests.",
-})
-
-func init() {
-	prometheus.Register(cacheHitsMetric)
-	prometheus.Register(cacheRequestsMetric)
-}
-
 func NewCacheBlockStore(size int) (blockstore.Blockstore, error) {
 	c, err := lru.New2Q[string, []byte](size)
 	if err != nil {
 		return nil, err
 	}
 
+	cacheHitsMetric := prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: "ipfs",
+		Subsystem: "http",
+		Name:      "blockstore_cache_hit",
+		Help:      "The number of global block cache hits.",
+	})
+
+	cacheRequestsMetric := prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: "ipfs",
+		Subsystem: "http",
+		Name:      "blockstore_cache_requests",
+		Help:      "The number of global block cache requests.",
+	})
+
+	err = prometheus.Register(cacheHitsMetric)
+	if err != nil {
+		return nil, err
+	}
+
+	err = prometheus.Register(cacheRequestsMetric)
+	if err != nil {
+		return nil, err
+	}
+
 	return &cacheBlockStore{
 		cache:               c,
 		rehash:              uatomic.NewBool(false),