refactor: bitswap client - remove tracing

Author: dirkmc

cmd/booster-bitswap/client.go

@@ -5,12 +5,10 @@ import (
 	"crypto/rand"
 	"fmt"
 	"github.com/ipld/go-car/v2/blockstore"
-	"net/http"
 	_ "net/http/pprof"
 	"sync/atomic"
 	"time"
 
-	"github.com/filecoin-project/boost/tracing"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/ipfs/go-bitswap/client"
 	bsnetwork "github.com/ipfs/go-bitswap/network"
@@ -25,7 +23,6 @@ import (
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	quic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
-	"github.com/pkg/profile"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/sync/errgroup"
 )
@@ -45,16 +42,6 @@ var fetchCmd = &cli.Command{
 			Usage: "concurrent request limit - 0 means unlimited",
 			Value: 10,
 		},
-		&cli.BoolFlag{
-			Name:  "tracing",
-			Usage: "enables tracing of booster-bitswap calls",
-			Value: false,
-		},
-		&cli.StringFlag{
-			Name:  "tracing-endpoint",
-			Usage: "the endpoint for the tracing exporter",
-			Value: "http://tempo:14268/api/traces",
-		},
 	},
 	Action: func(cctx *cli.Context) error {
 		if cctx.Args().Len() != 3 {
@@ -75,32 +62,8 @@ var fetchCmd = &cli.Command{
 
 		outputCarPath := cctx.Args().Get(2)
 
-		defer profile.Start(profile.TraceProfile, profile.ProfilePath(".")).Stop()
-
-		if cctx.Bool("pprof") {
-			go func() {
-				err := http.ListenAndServe("localhost:6065", nil)
-				if err != nil {
-					log.Error(err)
-				}
-			}()
-		}
-
 		ctx := lcli.ReqContext(cctx)
 
-		// Instantiate the tracer and exporter
-		if cctx.Bool("tracing") {
-			tracingStopper, err := tracing.New("booster-bsclient", cctx.String("tracing-endpoint"))
-			if err != nil {
-				return fmt.Errorf("failed to instantiate tracer: %w", err)
-			}
-			log.Info("Tracing exporter enabled")
-
-			defer func() {
-				_ = tracingStopper(ctx)
-			}()
-		}
-
 		// setup libp2p host
 		log.Infow("generating libp2p key")
 		privKey, _, err := crypto.GenerateECDSAKeyPair(rand.Reader)
@@ -132,13 +95,16 @@ var fetchCmd = &cli.Command{
 		}
 
 		bsClient := client.New(ctx, net, bs)
+		defer bsClient.Close()
 		net.Start(bsClient)
 
+		connectStart := time.Now()
 		log.Infow("connecting to server", "server", serverAddrInfo.String())
 		err = host.Connect(ctx, *serverAddrInfo)
 		if err != nil {
 			return fmt.Errorf("connecting to %s: %w", serverAddrInfo, err)
 		}
+		log.Debugw("connected to server", "duration", time.Since(connectStart))
 
 		var throttle chan struct{}
 		concurrency := cctx.Int("concurrency")
@@ -153,8 +119,11 @@ var fetchCmd = &cli.Command{
 			return fmt.Errorf("getting blocks: %w", err)
 		}
 
-		log.Infow("complete", "count", count, "size", size, "duration", time.Since(start))
-		return nil
+		log.Infow("fetch complete", "count", count, "size", size, "duration", time.Since(start))
+		log.Info("finalizing")
+		finalizeStart := time.Now()
+		defer func() { log.Info("finalize complete", "duration", time.Since(finalizeStart)) }()
+		return bs.Finalize()
 	},
 }
 

go.mod

@@ -90,7 +90,6 @@ require (
 	github.com/multiformats/go-multihash v0.2.1
 	github.com/multiformats/go-varint v0.0.6
 	github.com/open-rpc/meta-schema v0.0.0-20201029221707-1b72ef2ea333
-	github.com/pkg/profile v1.2.1
 	github.com/pressly/goose/v3 v3.5.3
 	github.com/prometheus/client_golang v1.12.1
 	github.com/raulk/clock v1.1.0

go.sum

@@ -1539,7 +1539,6 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/profile v1.2.1 h1:F++O52m40owAmADcojzM+9gyjmMOY/T4oYJkgFDH8RE=
 github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=