Remove deprecated flags (#15165)

* Remove deprecated flags

* changelog <3

* unblock Github actions

changelog/radek_v6-flags.md

@@ -0,0 +1,3 @@
+### Removed
+
+- Remove deprecated flags for the major release.

cmd/beacon-chain/main.go

@@ -85,7 +85,6 @@ var appFlags = []cli.Flag{
 	flags.BeaconDBPruning,
 	flags.PrunerRetentionEpochs,
 	flags.EnableBuilderSSZ,
-	cmd.BackupWebhookOutputDir,
 	cmd.MinimalConfigFlag,
 	cmd.E2EConfigFlag,
 	cmd.RPCMaxPageSizeFlag,
@@ -123,8 +122,6 @@ var appFlags = []cli.Flag{
 	debug.PProfAddrFlag,
 	debug.PProfPortFlag,
 	debug.MemProfileRateFlag,
-	debug.CPUProfileFlag,
-	debug.TraceFlag,
 	debug.BlockProfileRateFlag,
 	debug.MutexProfileFractionFlag,
 	cmd.LogFileName,

cmd/beacon-chain/usage.go

@@ -208,12 +208,8 @@ var appHelpFlagGroups = []flagGroup{
 	},
 	{ // The deprecated section represents beacon flags that still have use, but should not be used
 		// as they are expected to be deleted in a feature release.
-		Name: "deprecated",
-		Flags: []cli.Flag{
-			cmd.BackupWebhookOutputDir,
-			debug.CPUProfileFlag,
-			debug.TraceFlag,
-		},
+		Name:  "deprecated",
+		Flags: []cli.Flag{},
 	},
 	{ // Flags used in debugging Prysm. These are flags not usually run by end users.
 		Name: "debug",

cmd/flags.go

@@ -48,11 +48,6 @@ var (
 		Usage: `Serves HTTP handler to initiate database backups.
 		The handler is served on the monitoring port at path /db/backup.`,
 	}
-	// BackupWebhookOutputDir to customize the output directory for db backups.
-	BackupWebhookOutputDir = &cli.StringFlag{
-		Name:  "db-backup-output-dir",
-		Usage: "Output directory for db backups.",
-	}
 	// EnableTracingFlag defines a flag to enable p2p message tracing.
 	EnableTracingFlag = &cli.BoolFlag{
 		Name:  "enable-tracing",

cmd/validator/main.go

@@ -89,7 +89,6 @@ var appFlags = []cli.Flag{
 	////////////////////
 	cmd.DisableMonitoringFlag,
 	cmd.MonitoringHostFlag,
-	cmd.BackupWebhookOutputDir,
 	cmd.EnableBackupWebhookFlag,
 	cmd.MinimalConfigFlag,
 	cmd.E2EConfigFlag,
@@ -111,8 +110,6 @@ var appFlags = []cli.Flag{
 	debug.PProfAddrFlag,
 	debug.PProfPortFlag,
 	debug.MemProfileRateFlag,
-	debug.CPUProfileFlag,
-	debug.TraceFlag,
 	debug.BlockProfileRateFlag,
 	debug.MutexProfileFractionFlag,
 	cmd.AcceptTosFlag,

cmd/validator/usage.go

@@ -61,7 +61,6 @@ var appHelpFlagGroups = []flagGroup{
 			cmd.ClearDB,
 			cmd.ForceClearDB,
 			cmd.EnableBackupWebhookFlag,
-			cmd.BackupWebhookOutputDir,
 			cmd.EnableTracingFlag,
 			cmd.TracingProcessNameFlag,
 			cmd.TracingEndpointFlag,
@@ -156,11 +155,8 @@ var appHelpFlagGroups = []flagGroup{
 		},
 	},
 	{
-		Name: "deprecated",
-		Flags: []cli.Flag{
-			debug.CPUProfileFlag,
-			debug.TraceFlag,
-		},
+		Name:  "deprecated",
+		Flags: []cli.Flag{},
 	},
 }
 

runtime/debug/debug.go

@@ -78,18 +78,6 @@ var (
 		Name:  "blockprofilerate",
 		Usage: "Turns on block profiling with the given rate.",
 	}
-	// deprecated: CPUProfileFlag
-	CPUProfileFlag = &cli.StringFlag{
-		Name:   "cpuprofile",
-		Hidden: true,
-		Usage:  "Do not use, deprecated",
-	}
-	// deprecated: TraceFlag
-	TraceFlag = &cli.StringFlag{
-		Name:   "trace",
-		Hidden: true,
-		Usage:  "Do not use, deprecated",
-	}
 )
 
 // HandlerT implements the debugging API.

validator/node/BUILD.bazel

@@ -42,7 +42,6 @@ go_library(
         "//config/proposer:go_default_library",
         "//config/proposer/loader:go_default_library",
         "//io/file:go_default_library",
-        "//monitoring/backup:go_default_library",
         "//monitoring/prometheus:go_default_library",
         "//monitoring/tracing:go_default_library",
         "//runtime:go_default_library",

validator/node/node.go

@@ -26,7 +26,6 @@ import (
 	"github.com/OffchainLabs/prysm/v6/config/proposer"
 	"github.com/OffchainLabs/prysm/v6/config/proposer/loader"
 	"github.com/OffchainLabs/prysm/v6/io/file"
-	"github.com/OffchainLabs/prysm/v6/monitoring/backup"
 	"github.com/OffchainLabs/prysm/v6/monitoring/prometheus"
 	"github.com/OffchainLabs/prysm/v6/monitoring/tracing"
 	"github.com/OffchainLabs/prysm/v6/runtime"
@@ -376,20 +375,9 @@ func (c *ValidatorClient) registerPrometheusService(cliCtx *cli.Context) error {
 		log.Info("Prometheus service disabled")
 		return nil
 	}
-	var additionalHandlers []prometheus.Handler
-	if cliCtx.IsSet(cmd.EnableBackupWebhookFlag.Name) {
-		additionalHandlers = append(
-			additionalHandlers,
-			prometheus.Handler{
-				Path:    "/db/backup",
-				Handler: backup.Handler(c.db, cliCtx.String(cmd.BackupWebhookOutputDir.Name)),
-			},
-		)
-	}
 	service := prometheus.NewService(
 		fmt.Sprintf("%s:%d", cliCtx.String(cmd.MonitoringHostFlag.Name), cliCtx.Int(flags.MonitoringPortFlag.Name)),
 		c.services,
-		additionalHandlers...,
 	)
 	logrus.AddHook(prometheus.NewLogrusCollector())
 	return c.services.RegisterService(service)