From e6e03c8ac9dfdd416af436bb645699ea03a548de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Kapka?= Date: Fri, 11 Apr 2025 15:38:49 +0200 Subject: [PATCH] Remove deprecated flags (#15165) * Remove deprecated flags * changelog <3 * unblock Github actions --- changelog/radek_v6-flags.md | 3 +++ cmd/beacon-chain/main.go | 3 --- cmd/beacon-chain/usage.go | 8 ++------ cmd/flags.go | 5 ----- cmd/validator/main.go | 3 --- cmd/validator/usage.go | 8 ++------ runtime/debug/debug.go | 12 ------------ validator/node/BUILD.bazel | 1 - validator/node/node.go | 12 ------------ 9 files changed, 7 insertions(+), 48 deletions(-) create mode 100644 changelog/radek_v6-flags.md diff --git a/changelog/radek_v6-flags.md b/changelog/radek_v6-flags.md new file mode 100644 index 0000000000..ecd8e6dc4e --- /dev/null +++ b/changelog/radek_v6-flags.md @@ -0,0 +1,3 @@ +### Removed + +- Remove deprecated flags for the major release. \ No newline at end of file diff --git a/cmd/beacon-chain/main.go b/cmd/beacon-chain/main.go index 84f5b07058..6ea8f0c241 100644 --- a/cmd/beacon-chain/main.go +++ b/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, diff --git a/cmd/beacon-chain/usage.go b/cmd/beacon-chain/usage.go index 43492edd6b..c6dd596fcb 100644 --- a/cmd/beacon-chain/usage.go +++ b/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", diff --git a/cmd/flags.go b/cmd/flags.go index 5ecb011c36..e9df8d690b 100644 --- a/cmd/flags.go +++ b/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", diff --git a/cmd/validator/main.go b/cmd/validator/main.go index 81091c7c42..b1fad8a897 100644 --- a/cmd/validator/main.go +++ b/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, diff --git a/cmd/validator/usage.go b/cmd/validator/usage.go index af60ac0935..9407b6893c 100644 --- a/cmd/validator/usage.go +++ b/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{}, }, } diff --git a/runtime/debug/debug.go b/runtime/debug/debug.go index a91b643b94..91ff4fe941 100644 --- a/runtime/debug/debug.go +++ b/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. diff --git a/validator/node/BUILD.bazel b/validator/node/BUILD.bazel index 7218eb48db..5fbde0d71c 100644 --- a/validator/node/BUILD.bazel +++ b/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", diff --git a/validator/node/node.go b/validator/node/node.go index 2b9a169bc2..da0bc25481 100644 --- a/validator/node/node.go +++ b/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)