Merge branch 'resume-reprovide-cycle' into reprovide-sweep-enabled

Author: guillaumemichel

go.mod

@@ -2,8 +2,6 @@ module github.com/ipfs/kubo
 
 go 1.25
 
-replace github.com/libp2p/go-libp2p-kad-dht => ../go-libp2p-kad-dht
-
 require (
 	bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2

go.sum

@@ -518,6 +518,8 @@ github.com/libp2p/go-libp2p-gostream v0.6.0 h1:QfAiWeQRce6pqnYfmIVWJFXNdDyfiR/qk
 github.com/libp2p/go-libp2p-gostream v0.6.0/go.mod h1:Nywu0gYZwfj7Jc91PQvbGU8dIpqbQQkjWgDuOrFaRdA=
 github.com/libp2p/go-libp2p-http v0.5.0 h1:+x0AbLaUuLBArHubbbNRTsgWz0RjNTy6DJLOxQ3/QBc=
 github.com/libp2p/go-libp2p-http v0.5.0/go.mod h1:glh87nZ35XCQyFsdzZps6+F4HYI6DctVFY5u1fehwSg=
+github.com/libp2p/go-libp2p-kad-dht v0.35.2-0.20251024160545-decf9d8c2ed3 h1:s1r9HqCXtJeQxr8jinxXZFtW8zI7H9gDVUTreVnV9I0=
+github.com/libp2p/go-libp2p-kad-dht v0.35.2-0.20251024160545-decf9d8c2ed3/go.mod h1:aHMTg23iseX9grGSfA5gFUzLrqzmYbA8PqgGPqM8VkI=
 github.com/libp2p/go-libp2p-kbucket v0.3.1/go.mod h1:oyjT5O7tS9CQurok++ERgc46YLwEpuGoFq9ubvoUOio=
 github.com/libp2p/go-libp2p-kbucket v0.8.0 h1:QAK7RzKJpYe+EuSEATAaaHYMYLkPDGC18m9jxPLnU8s=
 github.com/libp2p/go-libp2p-kbucket v0.8.0/go.mod h1:JMlxqcEyKwO6ox716eyC0hmiduSWZZl6JY93mGaaqc4=

routing/delegated.go

@@ -6,6 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"path"
+	"strings"
 
 	drclient "github.com/ipfs/boxo/routing/http/client"
 	"github.com/ipfs/boxo/routing/http/contentrouter"
@@ -24,6 +26,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/routing"
 	ma "github.com/multiformats/go-multiaddr"
 	"go.opencensus.io/stats/view"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 )
 
 var log = logging.Logger("routing/delegated")
@@ -187,8 +190,27 @@ func httpRoutingFromConfig(conf config.Router, extraHTTP *ExtraHTTPParams) (rout
 
 	delegateHTTPClient := &http.Client{
 		Transport: &drclient.ResponseBodyLimitedTransport{
-			RoundTripper: transport,
-			LimitBytes:   1 << 20,
+			RoundTripper: otelhttp.NewTransport(transport,
+				otelhttp.WithSpanNameFormatter(func(operation string, req *http.Request) string {
+					if req.Method == http.MethodGet {
+						switch {
+						case strings.HasPrefix(req.URL.Path, "/routing/v1/providers"):
+							return "DelegatedHTTPClient.FindProviders"
+						case strings.HasPrefix(req.URL.Path, "/routing/v1/peers"):
+							return "DelegatedHTTPClient.FindPeers"
+						case strings.HasPrefix(req.URL.Path, "/routing/v1/ipns"):
+							return "DelegatedHTTPClient.GetIPNS"
+						}
+					} else if req.Method == http.MethodPut {
+						switch {
+						case strings.HasPrefix(req.URL.Path, "/routing/v1/ipns"):
+							return "DelegatedHTTPClient.PutIPNS"
+						}
+					}
+					return "DelegatedHTTPClient." + path.Dir(req.URL.Path)
+				}),
+			),
+			LimitBytes: 1 << 20,
 		},
 	}