Merge pull request #4740 from ethereum-optimism/pprof-fix

op-node: fix pprof missing handler, use op-service pprof util instead

op-node/cmd/main.go

@@ -3,16 +3,17 @@ package main
 import (
 	"context"
 	"net"
-	"net/http"
 	"os"
 	"os/signal"
+	"strconv"
 	"syscall"
-	"time"
 
 	"github.com/ethereum-optimism/optimism/op-node/cmd/doc"
 
 	"github.com/urfave/cli"
 
+	"github.com/ethereum/go-ethereum/log"
+
 	opnode "github.com/ethereum-optimism/optimism/op-node"
 	"github.com/ethereum-optimism/optimism/op-node/cmd/genesis"
 	"github.com/ethereum-optimism/optimism/op-node/cmd/p2p"
@@ -21,7 +22,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/metrics"
 	"github.com/ethereum-optimism/optimism/op-node/node"
 	"github.com/ethereum-optimism/optimism/op-node/version"
-	"github.com/ethereum/go-ethereum/log"
+	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
 )
 
 var (
@@ -145,24 +146,14 @@ func RollupNodeMain(ctx *cli.Context) error {
 	}
 
 	if cfg.Pprof.Enabled {
-		var srv http.Server
-		srv.Addr = net.JoinHostPort(cfg.Pprof.ListenAddr, cfg.Pprof.ListenPort)
-		// Start pprof server + register it's shutdown
+		pprofCtx, pprofCancel := context.WithCancel(context.Background())
 		go func() {
-			log.Info("pprof server started", "addr", srv.Addr)
-			if err := srv.ListenAndServe(); err != http.ErrServerClosed {
-				log.Error("error in pprof server", "err", err)
-			} else {
-				log.Info("pprof server shutting down")
+			log.Info("pprof server started", "addr", net.JoinHostPort(cfg.Pprof.ListenAddr, strconv.Itoa(cfg.Pprof.ListenPort)))
+			if err := oppprof.ListenAndServe(pprofCtx, cfg.Pprof.ListenAddr, cfg.Pprof.ListenPort); err != nil {
+				log.Error("error starting pprof", "err", err)
 			}
-
-		}()
-		defer func() {
-			shutCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			err := srv.Shutdown(shutCtx)
-			log.Info("pprof server shut down", "err", err)
 		}()
+		defer pprofCancel()
 	}
 
 	interruptChannel := make(chan os.Signal, 1)

op-node/node/config.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
+	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
 )
 
 type Config struct {
@@ -29,7 +30,7 @@ type Config struct {
 
 	Metrics MetricsConfig
 
-	Pprof PprofConfig
+	Pprof oppprof.CLIConfig
 
 	// Used to poll the L1 for new finalized or safe blocks
 	L1EpochPollInterval time.Duration
@@ -67,16 +68,6 @@ func (m MetricsConfig) Check() error {
 	return nil
 }
 
-type PprofConfig struct {
-	Enabled    bool
-	ListenAddr string
-	ListenPort string
-}
-
-func (p PprofConfig) Check() error {
-	return nil
-}
-
 type HeartbeatConfig struct {
 	Enabled bool
 	Moniker string

op-node/service.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/sources"
+	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
 
 	"github.com/urfave/cli"
 
@@ -75,10 +76,10 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 			ListenAddr: ctx.GlobalString(flags.MetricsAddrFlag.Name),
 			ListenPort: ctx.GlobalInt(flags.MetricsPortFlag.Name),
 		},
-		Pprof: node.PprofConfig{
+		Pprof: oppprof.CLIConfig{
 			Enabled:    ctx.GlobalBool(flags.PprofEnabledFlag.Name),
 			ListenAddr: ctx.GlobalString(flags.PprofAddrFlag.Name),
-			ListenPort: ctx.GlobalString(flags.PprofPortFlag.Name),
+			ListenPort: ctx.GlobalInt(flags.PprofPortFlag.Name),
 		},
 		P2P:                 p2pConfig,
 		P2PSigner:           p2pSignerSetup,